Commits

Show all
Author Commit Message Labels Comments Date
Katsunori FUJIWARA
convert: detect removal of ".gitmodules" at git source revisions correctly Before this patch, all operations applied on ".gitmodules" at git source revisions are treated as modification, even if they are actually removal of it. If removal of ".gitmodules" is treated as modification unexpectedly, "hg convert" is aborted by the exception raised in "retrievegitmodules()" for ".gitmodules" at the git source revision removing it, because that revision doesn't have any inform…
Branches
stable
Matt Mackall
templates: escape NUL bytes in jsonescape (issue4303) It's currently possible for various fields to contain NUL bytes, which are disallowed in JSON.
Branches
stable
Jim Hague
bugzilla: stop trying to cache setup across hook invocation In the context of standalone Hg receiving a set of incoming changes, it makes sense for the Bugzilla module to cache basic setup to avoid reconnecting to Bugzilla for each change. After processing the changes, Hg will exit and so the connection is short-lived. But this doesn't work too well when used from a long-lived environment such as hgweb or Kallithea where, for example, the connection can t…
Branches
stable
Matt Mackall
bookmarks: avoid deleting primary bookmarks on rebase Prior to this, doing "hg rebase -s @foo -d @" would delete @, which is obviously wrong: a primary bookmark should never be automatically deleted. This change blocks the deletion, but doesn't yet properly clean up the divergence: @ should replace @foo.
Branches
stable
Jim Hague
bugzilla: correct config documentation error The config documentation specifies the wrong access method in the XMLRPC+email configuration.
Branches
stable
Alex Gaynor
setup: fixed for Pythons which don't have a CFLAGS Specifically this is observed to happen on the PyPy one gets from homebrew
Branches
stable
Matt Mackall
Added signature for changeset 2d8cd3d0e83c
Branches
stable
Matt Mackall
Added tag 3.0.2 for changeset 2d8cd3d0e83c
Branches
stable
Matt Mackall
merge with i18n
Tags
3.0.2
Branches
stable
Wagner Bruna
i18n-pt_BR: synchronized with a4b67bf1f0a5
Branches
stable
Katsunori FUJIWARA
i18n-ja: synchronized with a4b67bf1f0a5
Branches
stable
Augie Fackler
rebase: fix bug that caused transitive copy records to disappear (issue4192) The defect was that copies were always duplicated against the target revision, rather than the first parent of the revision being rebased. This produced nominally correct results if changes were rebased one at a time (or with --collapse), but was wrong if we rebased a sequence of changesets which contained a sequence of copies.
Branches
stable
Augie Fackler
cmdutil: add copy-filtering support to duplicatecopies In order to fix issue 4192 we need to be able to skip some copies while doing duplicatecopies.
Branches
stable
Angel Ezquerra
repoview: do not crash when localtags refers to non existing revisions This fixes a crash that may happen when using mercurial 3.0.x. The _gethiddenblockers function assumed that the output of tags.readlocaltags() was a dict mapping tags to of valid nodes. However this was not necessarily the case. When a repository had obsolete revisions and had local tag pointing to a non existing revision was found, many mercurial commands would crash. This revision fixes the pr…
Branches
stable
Siddharth Agarwal
match: make glob '**/' match the empty string Previously, a glob pattern of the form 'foo/**/bar' would match 'foo/a/bar' but not 'foo/bar'. That was because the '**' in 'foo/**/bar' would be translated to '.*', making the final regex pattern 'foo/.*/bar'. That pattern doesn't match the string 'foo/bar'. This is a bug because the '**/' glob matches the empty string in standard Unix shells like bash and zsh. Fix that by making the ending '/'…
Branches
stable
Matt Mackall
push: restore contents of HG_URL for hooks (issue4268)
Branches
stable
Matt Mackall
tests: ignore missing file with PYTHONDONTWRITEBYTECODE (issue4239)
Branches
stable
Matt Mackall
hgweb: avoid initialization race (issue4280)
Branches
stable
Matt Mackall
p4: accept changesets with no description (issue4282)
Branches
stable
Matt Mackall
revlog: fix check-code error
Branches
stable
Matt Mackall
revlog: hold a private reference to self._cache This keeps other threads from modifying self._cache out from under us. With this and the previous fix, 'hg serve' survives 100k hits with siege.
Branches
stable
Matt Mackall
revlog: make _chunkcache access atomic With this and related fixes, 'hg serve' survived 100000 hits with siege.
Branches
stable
Danek Duvall
tests: cat error messages are different on Solaris
Branches
stable
Danek Duvall
parsers.c: fix a couple of memory leaks
Branches
stable
Mads Kiilerich
resolve: keep wlock while resolving This will make resolve use correct locking and thus make it more safe. Resolve is usually a long running command spending a lot of time waiting for user input on hard problems. It is thus a real world scenario to start multiple resolves at once or run other commands (such as up -C and merge) while resolve is running. Proper locking prevents that.
Branches
stable
Katsunori FUJIWARA
keyword: suppress keyword expansion while 'hg fetch' for internal merge Before this patch, 'hg fetch' may cause unexpected conflict, if 'hg fetch'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg fetch' for internal merge by adding 'fetch' to 'restricted' command list like 'merge'. This patch uses 'hg import' to safely crea…
Branches
stable
Katsunori FUJIWARA
keyword: suppress keyword expansion while 'hg histedit' for internal merge Before this patch, 'hg histedit' may cause unexpected conflict, if 'hg histedit'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg histedit' for internal merge by adding 'histedit' to 'restricted' command list like 'merge'. Test in this patch just swaps …
Branches
stable
Katsunori FUJIWARA
keyword: suppress keyword expansion while 'hg backout' for internal merge Before this patch, 'hg backout' may cause unexpected conflict, if 'hg backout'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg backout' for internal merge by adding 'backout' to 'restricted' command list like 'merge'.
Branches
stable
Katsunori FUJIWARA
keyword: suppress keyword expansion while 'hg graft' for internal merge Before this patch, 'hg graft' may cause unexpected conflict, if 'hg graft'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg graft' for internal merge by adding 'graft' to 'restricted' command list like 'merge'.
Branches
stable
Katsunori FUJIWARA
keyword: suppress keyword expansion while 'hg rebase' for internal merge Before this patch, 'hg rebase' may cause unexpected conflict, if 'hg rebase'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg rebase' for internal merge by adding 'rebase' to 'restricted' command list like 'merge'. This patch specifies '--keep' to 'hg r…
Branches
stable
  1. Prev
  2. Next