From ad72241379668b5eb4d0524b9da968f7dd3ae8eb Mon Sep 17 00:00:00 2001 From: Alexander Pepper Date: Tue, 9 Aug 2011 15:37:07 +0200 Subject: [PATCH 1/3] [Git] function show: Better merge display. Only files that are really changed during a merge now show up. Option "-m" removed, because it showed ALL changes of the merged tries. Option "-M" and "-C" added, because function log also uses them and it's better for file_names of renames and copies. --- repositoryhandler/backends/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repositoryhandler/backends/git.py b/repositoryhandler/backends/git.py index 07e99bd..e44e3b2 100644 --- a/repositoryhandler/backends/git.py +++ b/repositoryhandler/backends/git.py @@ -358,7 +358,7 @@ def show (self, uri, rev = None): cwd = os.getcwd () target = None - cmd = ['git', 'show', '-m', '--pretty=format:'] + cmd = ['git', 'show', '--pretty=format:', '-M', '-C'] if rev is not None: cmd.append (rev) From 1a2b19a2ac30a647caf093377dc6ce80f47af2bd Mon Sep 17 00:00:00 2001 From: Alexander Pepper Date: Thu, 11 Aug 2011 15:42:37 +0200 Subject: [PATCH 2/3] [Git] Added Option "--cc" to repo.log for better merge handling. With this, files that are change during a merges are listed. --- repositoryhandler/backends/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repositoryhandler/backends/git.py b/repositoryhandler/backends/git.py index e44e3b2..979f896 100644 --- a/repositoryhandler/backends/git.py +++ b/repositoryhandler/backends/git.py @@ -262,7 +262,7 @@ def log (self, uri, rev = None, files = None, branch = None): else: cwd = os.getcwd () - cmd = ['git', 'log', '--topo-order', '--pretty=fuller', '--parents', '--name-status', '-M', '-C'] + cmd = ['git', 'log', '--topo-order', '--pretty=fuller', '--parents', '--name-status', '-M', '-C', '--cc'] # Git < 1.6.4 -> --decorate # Git = 1.6.4 -> broken From 083774df9ddfcdf18e1193364e92a7f932e9a551 Mon Sep 17 00:00:00 2001 From: Alexander Pepper Date: Fri, 12 Aug 2011 11:26:17 +0200 Subject: [PATCH 3/3] [Git] Removed option "-M" and "-C" again, because it made output more fussy. --- repositoryhandler/backends/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repositoryhandler/backends/git.py b/repositoryhandler/backends/git.py index 979f896..8126441 100644 --- a/repositoryhandler/backends/git.py +++ b/repositoryhandler/backends/git.py @@ -358,7 +358,7 @@ def show (self, uri, rev = None): cwd = os.getcwd () target = None - cmd = ['git', 'show', '--pretty=format:', '-M', '-C'] + cmd = ['git', 'show', '--pretty=format:'] if rev is not None: cmd.append (rev)