equal
deleted
inserted
replaced
10 mergestate as mergestatemod, |
10 mergestate as mergestatemod, |
11 pycompat, |
11 pycompat, |
12 registrar, |
12 registrar, |
13 repair, |
13 repair, |
14 scmutil, |
14 scmutil, |
15 util, |
|
16 ) |
15 ) |
17 |
16 |
18 release = lockmod.release |
17 release = lockmod.release |
19 |
18 |
20 cmdtable = {} |
19 cmdtable = {} |
34 def _findupdatetarget(repo, nodes): |
33 def _findupdatetarget(repo, nodes): |
35 unode, p2 = repo.changelog.parents(nodes[0]) |
34 unode, p2 = repo.changelog.parents(nodes[0]) |
36 currentbranch = repo[None].branch() |
35 currentbranch = repo[None].branch() |
37 |
36 |
38 if ( |
37 if ( |
39 util.safehasattr(repo, 'mq') |
38 hasattr(repo, 'mq') |
40 and p2 != repo.nullid |
39 and p2 != repo.nullid |
41 and p2 in [x.node for x in repo.mq.applied] |
40 and p2 in [x.node for x in repo.mq.applied] |
42 ): |
41 ): |
43 unode = p2 |
42 unode = p2 |
44 elif currentbranch != repo[unode].branch(): |
43 elif currentbranch != repo[unode].branch(): |