Skip to content

Full diff #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Full diff #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47a2278
git: allow two commits to be compared with diffuse -c commit1..commit2
nschaeff Jun 1, 2023
089f1ff
hg: allow two commits to be compared with diffuse -c commit1..commit2
nschaeff Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/diffuse/vcs/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ def getCommitTemplate(self, prefs, rev, names):
for name in names:
isabs |= os.path.isabs(name)
# run command
prev = rev + '^'
if '..' in rev:
prev, rev = rev.split('..')
else:
prev = rev + '^'
fs = FolderSet(names)
modified = {}
for s in utils.popenReadLines(self.root, args, prefs, 'git_bash'):
Expand Down
8 changes: 7 additions & 1 deletion src/diffuse/vcs/hg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ def _getCommitTemplate(self, prefs, names, cmd, rev):
args.append(utils.safeRelativePath(self.root, name, prefs, 'hg_cygwin'))
# run command
prev = self._getPreviousRevision(prefs, rev)
if rev is not None:
if '..' in rev:
prev, rev = rev.split('..')
args.extend(['-r',prev,'-r',rev])
else:
args.extend(['-r',rev])
fs = FolderSet(names)
modified = {}
for s in utils.popenReadLines(self.root, args, prefs, 'hg_bash'):
Expand All @@ -92,7 +98,7 @@ def getCommitTemplate(self, prefs, rev, names):
return self._getCommitTemplate(
prefs,
names,
['log', '--template', 'A\t{file_adds}\nM\t{file_mods}\nR\t{file_dels}\n', '-r', rev],
['log', '--template', 'A\t{file_adds}\nM\t{file_mods}\nR\t{file_dels}\n'],
rev)

def getFolderTemplate(self, prefs, names):
Expand Down