equal
deleted
inserted
replaced
12 |
12 |
13 from mercurial.i18n import _ |
13 from mercurial.i18n import _ |
14 from mercurial.node import ( |
14 from mercurial.node import ( |
15 bin, |
15 bin, |
16 hex, |
16 hex, |
17 nullid, |
|
18 short, |
17 short, |
19 ) |
18 ) |
20 from mercurial import ( |
19 from mercurial import ( |
21 cmdutil, |
20 cmdutil, |
22 error, |
21 error, |
312 opts[b'date'] = dateutil.parsedate(date) |
311 opts[b'date'] = dateutil.parsedate(date) |
313 |
312 |
314 if revs: |
313 if revs: |
315 nodes = [repo.lookup(n) for n in revs] |
314 nodes = [repo.lookup(n) for n in revs] |
316 else: |
315 else: |
317 nodes = [node for node in repo.dirstate.parents() if node != nullid] |
316 nodes = [ |
|
317 node for node in repo.dirstate.parents() if node != repo.nullid |
|
318 ] |
318 if len(nodes) > 1: |
319 if len(nodes) > 1: |
319 raise error.Abort( |
320 raise error.Abort( |
320 _(b'uncommitted merge - please provide a specific revision') |
321 _(b'uncommitted merge - please provide a specific revision') |
321 ) |
322 ) |
322 if not nodes: |
323 if not nodes: |