equal
deleted
inserted
replaced
70 This is roughly equivalent to 'topic(.) - obsolete' with a sorting moving |
70 This is roughly equivalent to 'topic(.) - obsolete' with a sorting moving |
71 unstable changeset after there future parent (as if evolve where already |
71 unstable changeset after there future parent (as if evolve where already |
72 run).""" |
72 run).""" |
73 err = 'stack() takes no argument, it works on current topic' |
73 err = 'stack() takes no argument, it works on current topic' |
74 revset.getargs(x, 0, 0, err) |
74 revset.getargs(x, 0, 0, err) |
75 topic = repo.currenttopic |
|
76 topic = None |
75 topic = None |
77 branch = None |
76 branch = None |
78 if not topic and repo.currenttopic: |
77 if repo.currenttopic: |
79 topic = repo.currenttopic |
78 topic = repo.currenttopic |
80 if not topic: |
79 else: |
81 branch = repo[None].branch() |
80 branch = repo[None].branch() |
82 return revset.baseset(stack.stack(repo, branch=branch, topic=topic)[1:]) & subset |
81 return revset.baseset(stack.stack(repo, branch=branch, topic=topic)[1:]) & subset |