开发者

mercurial: test whether a branch contains a changeset

开发者 https://www.devze.com 2022-12-10 03:47 出处:网络
I wonder whether there is a mercurial command/extension that just tests whether a given changeset is in a branch. The command would be something like:

I wonder whether there is a mercurial command/extension that just tests whether a given changeset is in a branch. The command would be something like:

hg contains [-r branch] changeset_id

and should check whether the given changeset is in the current/given branch, returning just "Yes" or "No".

I know about the "de开发者_C百科bugancestor" command, but a "Yes/No" answer is way easier to read.

And if there is, is it possible to check for transplanted changesets as well?

EDIT: The scenario is located in a repo where named branches have multiple heads. Lets say a branch is named "dev-X", having more than 1 head and a longer history, too long at least to track it with various graph visualizations. I want to figure out whether a changeset X in branch "dev-X" was merged into another head of "dev-X". Therefore I cannot use branch names but only changeset numbers/hashes to specify a branch.

And to top it all, I'm trying to find out whether changeset X was transplanted there, possibly taking more than 1 transplantation step. I know that the necessary info is stored in mercurial (I've seen it when tampering with the mercurial internals), it's just not accessible via the command line interface.


How about this:

hg log -r changeset_id -b branchname

That will give some output if changeid_id includes changes on branch branchname, otherwise no output is returned.

You could wrap it in a bash function if you want:

function contains() {
    if [ "$(hg log -r $1 -b $2)" == "" ]
    then
        echo no
    else
        echo yes
    fi
}

which does this:

$ contains 0 default
yes
$ contains 0 other   
no


using 1.6 and later with the power of revision sets all you need is

hg log --rev "ancestors(.) and <revNum>"

eg

hg log --rev "ancestors(.) and 1234"

blank means no, output means yes, its in your history. Some of the other solutions posted here wont work if the changeset was created in a named branch, even if it was merged at some point later.


As mentioned in the comment above I gave it a shot, this is what came out:

http://bitbucket.org/resi/hg-contains/


It should be pretty easy to transform the results from debugancestor into a yes or a no (but there's definitely no built-in way to do that; write a script already!). Be aware that the answer might be wrong if the branch has more than one branch head, though.

(Writing an extension to add a command to do this should also be nigh-trivial, BTW.)


You could always just print out the name of the branch for that revision (it'll be empty if it's default) and then test that against whatever you want (in bash or in a scripting language of some sort):

hg log --template '{branches}' -r <revision name/number>


I've tested most of approaches above, did not work. The extension 'contains' somehow takes wrong revision (I think its a bug), the hg log --rev "ancestors(.) and 1234" work, but I found even more simple approach to do this:

hg merge -P <changeset>

Will show you if anything unmerged remains (it will also include changesets which are not merged parents of the changeset in question)

0

精彩评论

暂无评论...
验证码 换一张
取 消