##// END OF EJS Templates
diff: change --inverse to --reverse...
Martin Geisler -
r9857:24bc6e41 default
parent child Browse files
Show More
@@ -1129,7 +1129,7 b' class queue(object):'
1129 1129 self.ui.write(_("no patches applied\n"))
1130 1130 return
1131 1131 qp = self.qparents(repo, top)
1132 if opts.get('inverse'):
1132 if opts.get('reverse'):
1133 1133 node1, node2 = None, qp
1134 1134 else:
1135 1135 node1, node2 = qp, None
@@ -1099,7 +1099,7 b' def diff(ui, repo, *pats, **opts):'
1099 1099 revs = opts.get('rev')
1100 1100 change = opts.get('change')
1101 1101 stat = opts.get('stat')
1102 inv = opts.get('inverse')
1102 reverse = opts.get('reverse')
1103 1103
1104 1104 if revs and change:
1105 1105 msg = _('cannot specify --rev and --change at the same time')
@@ -1110,7 +1110,7 b' def diff(ui, repo, *pats, **opts):'
1110 1110 else:
1111 1111 node1, node2 = cmdutil.revpair(repo, revs)
1112 1112
1113 if inv:
1113 if reverse:
1114 1114 node1, node2 = node2, node1
1115 1115
1116 1116 if stat:
@@ -3284,7 +3284,7 b' diffopts = ['
3284 3284
3285 3285 diffopts2 = [
3286 3286 ('p', 'show-function', None, _('show which function each change is in')),
3287 ('', 'inverse', None, _('produce a diff that undoes the changes')),
3287 ('', 'reverse', None, _('produce a diff that undoes the changes')),
3288 3288 ('w', 'ignore-all-space', None,
3289 3289 _('ignore white space when comparing lines')),
3290 3290 ('b', 'ignore-space-change', None,
@@ -167,7 +167,7 b' add: include, exclude, dry-run'
167 167 annotate: rev, follow, text, user, date, number, changeset, line-number, include, exclude
168 168 clone: noupdate, updaterev, rev, pull, uncompressed, ssh, remotecmd
169 169 commit: addremove, close-branch, include, exclude, message, logfile, date, user
170 diff: rev, change, text, git, nodates, show-function, inverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, include, exclude
170 diff: rev, change, text, git, nodates, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, include, exclude
171 171 export: output, switch-parent, text, git, nodates
172 172 forget: include, exclude
173 173 init: ssh, remotecmd
@@ -15,10 +15,10 b' f'
15 15 EOF
16 16 hg ci -m moda
17 17
18 hg diff --inverse -r0 -r1
18 hg diff --reverse -r0 -r1
19 19
20 20 cat >> a <<EOF
21 21 g
22 22 h
23 23 EOF
24 hg diff --inverse --nodates
24 hg diff --reverse --nodates
1 NO CONTENT: file renamed from tests/test-diff-inverse.out to tests/test-diff-reverse.out
@@ -239,7 +239,7 b' options:'
239 239 -g --git use git extended diff format
240 240 --nodates don't include dates in diff headers
241 241 -p --show-function show which function each change is in
242 --inverse produce a diff that undoes the changes
242 --reverse produce a diff that undoes the changes
243 243 -w --ignore-all-space ignore white space when comparing lines
244 244 -b --ignore-space-change ignore changes in the amount of white space
245 245 -B --ignore-blank-lines ignore changes whose lines are all blank
@@ -58,5 +58,5 b' hg qdiff --nodates -U 1 -B'
58 58 echo % qdiff -w
59 59 hg qdiff --nodates -w
60 60
61 echo % qdiff --inverse
62 hg qdiff --nodates --inverse
61 echo % qdiff --reverse
62 hg qdiff --nodates --reverse
@@ -85,7 +85,7 b' diff -r 35fb829491c1 lines'
85 85 1
86 86 2
87 87 3
88 % qdiff --inverse
88 % qdiff --reverse
89 89 diff -r 35fb829491c1 lines
90 90 --- a/lines
91 91 +++ b/lines
General Comments 0
You need to be logged in to leave comments. Login now