Show More
@@ -159,15 +159,14 b' elif cmd == "status":' | |||||
159 | for f in d: print "R", f |
|
159 | for f in d: print "R", f | |
160 |
|
160 | |||
161 | elif cmd == "diff": |
|
161 | elif cmd == "diff": | |
162 | doptions = {} |
|
|||
163 | revs = [] |
|
162 | revs = [] | |
164 |
|
163 | |||
165 | if args: |
|
164 | if args: | |
|
165 | doptions = {} | |||
166 | opts = [('r', 'revision', [], 'revision')] |
|
166 | opts = [('r', 'revision', [], 'revision')] | |
167 | args = fancyopts.fancyopts(args, opts, doptions, |
|
167 | args = fancyopts.fancyopts(args, opts, doptions, | |
168 | 'hg diff [options] [files]') |
|
168 | 'hg diff [options] [files]') | |
169 |
|
|
169 | revs = map(lambda x: repo.changelog.lookup(x), doptions['revision']) | |
170 | revs = [hg.bin(x) for x in doptions['revision']] |
|
|||
171 |
|
170 | |||
172 | if len(revs) > 2: |
|
171 | if len(revs) > 2: | |
173 | print "too many revisions to diff" |
|
172 | print "too many revisions to diff" | |
@@ -176,7 +175,7 b' elif cmd == "diff":' | |||||
176 | diff(args, *revs) |
|
175 | diff(args, *revs) | |
177 |
|
176 | |||
178 | elif cmd == "export": |
|
177 | elif cmd == "export": | |
179 |
node = |
|
178 | node = repo.changelog.lookup(args[0]) | |
180 | prev = repo.changelog.parents(node)[0] |
|
179 | prev = repo.changelog.parents(node)[0] | |
181 | diff(None, prev, node) |
|
180 | diff(None, prev, node) | |
182 |
|
181 |
General Comments 0
You need to be logged in to leave comments.
Login now