gmane.comp.version-control.mercurial.general

THG -- tab hover-tip for repo path?

Dave S — 2012-05-25T23:07:51

(I know, not a general Hg question.  Sorry)

Is it a reasonable suggestion to request a hovertip for the Workbench
/when you hover over the tab/?  That shows the path to the repo?

 I know there are hovertips for the path in the Repository Registry pane, but
   a) I often have the primary repo and its clone open on adjacent tabs
   b) I sometimes can't tell which registry item is _bolded_ (and that
shows the correspondence of the active tab to the registry)

I'd be happy also with a static display, but the space on the tab body
is kinda crowded; the biggest open area is to the left of Commit
button.

Thanks.

/dps

RE: Use hg commit --amend to change the files that are included inacommit

Becker, Mischa J — 2012-05-25T22:42:11

...


But the actual definition of amend is to alter something that already exists, not to redo it from scratch. As a non-mq user, I think if amend was changed to mean "redo the commit from scratch" it would be unintuitive for a lot of people.

Mischa



________________________________

This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain information that is confidential and protected by law from unauthorized disclosure. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.

Re: Use hg commit --amend to change the files that are included in acommit

John Peberdy — 2012-05-25T21:42:02

On Fri, May 25, 2012 at 5:08 PM, Angel Ezquerra
<angel.ezquerra< at >gmail.com> wrote:

As a data point, for several years MercurialEclipse has supported
amend on commit and it works exactly as the new commit --amend works.

Re: Bookmarks guide

Simon King — 2012-05-25T21:34:49

On Fri, May 25, 2012 at 10:24 PM, Angel Ezquerra
<angel.ezquerra< at >gmail.com> wrote:

You can get the same result with "head() and branch(branchname)"

Simon

Re: Bookmarks guide

Angel Ezquerra — 2012-05-25T21:24:56

OK, I get it now :-)

FWIW it was easier to understand by looking at the code in revset.py
than by reading the description given by hg help revsets.

Would it make sense to let head() accept an argument which specified
the branch we want the head to belong to?

Angel

Re: Use hg commit --amend to change the files that are included in acommit

Angel Ezquerra — 2012-05-25T21:08:59

On Fri, May 25, 2012 at 5:35 PM, Pierre-Yves David
<pierre-yves.david< at >logilab.fr> wrote:

I think commit --amend is not very widely used yet but I've been
encouraging people around here to use it instead of using mq. I got
the impression that the mental model that people have of amend is
"redo the commit" (as in redo it from scratch).

This may be because that is the model that _I_ had in the first place
(and I am the one explaining it to people). However I think that the
"new commit + qfold" model is too advanced for most basic users (who
may not even know what qfold is)! It makes sense if you think about it
and are an advanced mercurial user but I'm not sure it is something
that most users will easily grasp intuitively or without a proper
explanation.

Assuming that many users will think of amend as a way to "redo a
commit", not being able to chose which files are included in the
amended commit is likely to be confusing. It was confusing to me when
I discovered it, and a couple of guys have come telling me

Re: Bookmarks guide

Matt Mackall — 2012-05-25T21:07:42

Think harder, please.

Re: Bookmarks guide

Angel Ezquerra — 2012-05-25T20:40:03

I had read that but I do not see much difference. It seems a bit
redundant... "heads()" (with no argument) could also return "Changeset
that is a named branch head". This would have the added benefit that
its name would be the same as the "heads" command.

Angel

Re: Bookmarks guide

Matt Mackall — 2012-05-25T16:53:51

Compare:

    "head()"
      Changeset is a named branch head.

    "heads(set)"
      Members of set with no children in set.

Re: SVN-Mercurial conversion problems

Mads Kiilerich — 2012-05-25T16:27:31

That direction is usually not used by Mercurial developers and might be 
less tested than the opposite direction ;-)


 From 'hg help -v convert':
  -v --verbose           enable additional output
     --debug             enable debugging output

The following might help developers figuring out exactly where in the 
process it failed:
     --traceback         always print a traceback on exception


Yes - and subversion python bindings is used for converting from 
subversion. Combining different versions might be confusing.

/Mads

Re: Tracking repository version numbers between releases

Tom Anderson — 2012-05-25T16:19:08

That's certainly good if you already know it's a template. I 
half-remembered this feature, poked around in the help hg id and hg log, 
and found nothing.

tom

SVN-Mercurial conversion problems

Marko Asplund — 2012-05-25T16:04:38

Hi,

I'm trying to use the Convert Extension for converting multiple Mercurial
repositories to Subversion repositories.
Conversion fails for some repositories with errors like this:

hg convert --dest-type svn foobar-hg foobar-svn

...
118 cleanups
abort: svn exited with status 256

and another repository conversion fails with this error:

...
71 cleanup
unexpected svn output:
abort: unable to cope with svn output

Any suggestions for finding out the cause for these conversion failures?
Are there any other tools or methods I could try out for the conversion?

After successful conversion, hg reports that tags are not converted.
How could I get the tags also converted?

I'm using the following software versions:
Mercurial 2.2.1+20120504
Subversion 1.7.4 (r1295709). I've several Subversion versions installed.
How does Mercurial determine which one to use? Does it use the first one
found in $PATH?


thanks,
marko

Re: Tracking repository version numbers between releases

Stephen Morton — 2012-05-25T15:39:08

On Fri May 25 08:18:29 CDT 2012, Simon King simon wrote
wrote:
wrote:
do:
in an
revsets.
something
write
latest
know).
your
wrapped ctx
however


Some sort of regexp search within -r 'tag()' would be extremely useful. A
build environment is often doing stuff analagous to release_notes=$(hg -v
log -r "::last(branch(default)) and not
::last(tagged(r'foo_bar-nightly\.N\.\d+')) and not merge()" ) .  And while
It's really no big deal to get the tag by piping hg tags through grep and
head, but it would turn lots of longer operations into one-liners with this
feature.

Steve

Re: Use hg commit --amend to change the files that are included ina commit

Pierre-Yves David — 2012-05-25T15:35:56


In a world where you just "create" commit, you have two states to consider for file:

    1) "last" commit content (hg cat -r . babar.txt)
    2) current working directory content (cat babar.txt)

You can easily over of UI to say "pick (1) or (2)"

But in a world where you also rewrite commit you have three possible states to consider

    0) parent commit content (hg cat -r .^ babar.txt)
    1) "last" commit content (hg cat -r . babar.txt)
    C) current working directory content (cat babar.txt)

And it is more complicated to provide a UI to say "pick (0), (1) or (2)"

I think that the current commit --amend behavior (1) is the right one. Picking
(1) is consistent with the default behavior of commit. your amend will add to
history only changes you see with `hg status`  and `hg diff`.

I've see a lot a new comer confused by the (0) behavior of mq.


Yes handling the second situation would be useful. A dedicated "hg amend"
option to handle this advanced case (and other strange usecase) is probably a
better

Re: uisetup in record extension looks up mq - but the official docssay it shouldn't

Patrick Mézard — 2012-05-25T15:35:15

Le 17/05/12 15:58, Wujek Srujek a écrit :

This was changed by:

changeset:   9710:1765599f4899
user:        Martin Geisler <mg< at >lazybytes.net>
date:        Thu Nov 05 01:10:43 2009 +0100
files:       hgext/record.py
description:
record: use uisetup instead of extsetup to register qrecord

New commands should be registered in uisetup so that other extensions
have a chance of wrapping them in extsetup.


--
Patrick Mézard

Re: Tracking repository version numbers between releases

Simon King — 2012-05-25T13:18:29

Proof of concept modification to the 'tag' revset expression:

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
< at >< at > -1106,9 +1106,12 < at >< at >
         tn = getstring(args[0],
                        # i18n: "tag" is a keyword
                        _('the argument to tag must be a string'))
-        if not repo.tags().get(tn, None):
-            raise util.Abort(_("tag '%s' does not exist") % tn)
-        s = set([cl.rev(n) for t, n in repo.tagslist() if t == tn])
+        s = set()
+        for t, n in repo.tagslist():
+            if re.search(tn, t):
+                s.add(cl.rev(n))
+        if not s:
+            raise util.Abort(_("no tags matching '%s' exist") % tn)
     else:
         s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])
     return [r for r in subset if r in s]



The problem with this is that it requires patterns to be specified as
regular expressions. Is there any chance that this functionality would
be accepted if it a

Re: Tracking repository version numbers between releases

Isaac Jurado — 2012-05-25T13:17:27

I think it's pretty accesible:

    hg help templates

Re: Bookmarks guide

Isaac Jurado — 2012-05-25T13:14:22

On Fri, May 25, 2012 at 2:33 PM, Angel Ezquerra
<angel.ezquerra< at >gmail.com> wrote:

According to the help, the heads() predicate is a kind of filter,
which only returns the changesets that have no children.  On the other
hand, the head() predicate is equivalent to "hg heads".

Re: Tracking repository version numbers between releases

Simon King — 2012-05-25T12:56:28

[SNIP]

Something that might help is if the 'tag([name])' revset expression
could accept patterns. Then you could write things like:

  hg log -r 'last(ancestors(.) and tag("dev-*"))'

...to get the latest dev tag, and

  hg log -r 'last(ancestors(.) and tag("release-*"))'

...to get the release tag.

FWIW, using a tag on an old revision to indicate what the *next*
version is going to be feels like an abuse of tags to me, but it's
your choice :-)

Simon

Re: Bookmarks guide

Arne Babenhauserheide — 2012-05-25T12:35:38

At Fri, 25 May 2012 12:46:58 +0200,
Martin Geisler wrote:

I think you can have a “default” bookmark to which people will then
update on clone.
 
hg bookmark default -f # you need -f for this…

This will only work for the initial clone, though. You cannot just
create a tip bookmark (the real tip wins).

Best wishes,
Arne
_______________________________________________
Mercurial mailing list
Mercurial< at >selenic.com
http://selenic.com/mailman/listinfo/mercurial

Re: Bookmarks guide

Angel Ezquerra — 2012-05-25T12:33:18

On Fri, May 25, 2012 at 1:31 PM, Angel Ezquerra
<angel.ezquerra< at >gmail.com> wrote:

Actually I just realized that you can already do "heads(branch(default))".

Is there a reason why there is a head() and a heads() revset
predicate? couldn't "heads()" be the same as "head()"?

Angel