equal
deleted
inserted
replaced
77 short, |
77 short, |
78 ) |
78 ) |
79 from mercurial import ( |
79 from mercurial import ( |
80 cmdutil, |
80 cmdutil, |
81 commands, |
81 commands, |
|
82 dirstateguard, |
82 error, |
83 error, |
83 extensions, |
84 extensions, |
84 hg, |
85 hg, |
85 localrepo, |
86 localrepo, |
86 lock as lockmod, |
87 lock as lockmod, |
1722 |
1723 |
1723 bmlist = repo[top].bookmarks() |
1724 bmlist = repo[top].bookmarks() |
1724 |
1725 |
1725 dsguard = None |
1726 dsguard = None |
1726 try: |
1727 try: |
1727 dsguard = cmdutil.dirstateguard(repo, 'mq.refresh') |
1728 dsguard = dirstateguard.dirstateguard(repo, 'mq.refresh') |
1728 if diffopts.git or diffopts.upgrade: |
1729 if diffopts.git or diffopts.upgrade: |
1729 copies = {} |
1730 copies = {} |
1730 for dst in a: |
1731 for dst in a: |
1731 src = repo.dirstate.copied(dst) |
1732 src = repo.dirstate.copied(dst) |
1732 # during qfold, the source file for copies may |
1733 # during qfold, the source file for copies may |