Mercurial > hg-stable
comparison mercurial/patch.py @ 9725:3f522d2fa633
diff: add --inverse option
Most of the time, one can reverse a diff by swapping the revisions passed with
-r but it happens that if you use the global -R, and diff against the tip of
the current repo, you can't swap the revisions. One use-case for that is
reviewing changes from a bundle before unbundling. One could also pipe the
output of `hg diff` to a command line filter that reverses the diff, but that
would remove the benefit from color diffs. Therefore, having an option in
`hg diff` to reverse a diff is a good thing.
The option flag selection was tricky. GNU patch uses -R/--reverse but -R is
already used as a global option and --reverse would make --rev ambiguous.
author | Yannick Gingras <ygingras@ygingras.net> |
---|---|
date | Thu, 05 Nov 2009 15:18:56 +0100 |
parents | 18b134ef294c |
children | 155fe35534d3 9a4034b630c4 |
comparison
equal
deleted
inserted
replaced
9724:40ef3bf3e04a | 9725:3f522d2fa633 |
---|---|
1214 if node2 is None, compare node1 with working directory.''' | 1214 if node2 is None, compare node1 with working directory.''' |
1215 | 1215 |
1216 if opts is None: | 1216 if opts is None: |
1217 opts = mdiff.defaultopts | 1217 opts = mdiff.defaultopts |
1218 | 1218 |
1219 if not node1: | 1219 if not node1 and not node2: |
1220 node1 = repo.dirstate.parents()[0] | 1220 node1 = repo.dirstate.parents()[0] |
1221 | 1221 |
1222 def lrugetfilectx(): | 1222 def lrugetfilectx(): |
1223 cache = {} | 1223 cache = {} |
1224 order = [] | 1224 order = [] |