Commits

Author Commit Message Labels Comments Date
idank
commit: add option to amend the working dir parent The --amend flag can be used to amend the parent of the working directory with a new commit that contains the changes in the parent in addition to those currently reported by "hg status", if there are any. The old commit is stored in a backup bundle in ".hg/strip-backup"(see "hg help bundle" and "hg help unbundle" on how to restore it). Message, user and date are taken from the amended commit unl…
Bookmarks
amend
idank
repair: allow giving strip backup a different name So the user can differentiate amend backups from the rest.
idank
context: introduce changes function to get a list of files changed Will be used to display the list of changed files in the editor when amending.
Matt Mackall
merge with stable
Matt Mackall
perf: tweak tests for testing index performance improvements
Edouard Gomez
convert: support non annotated tags in git backend Do not blindly filter out non ending ^{} tags. The new logic is: - if both "tag" and "tag^{}" exist, "tag^{}" is what we want - if only "tag" exists, "tag" is fine
Matt Mackall
merge with stable
Matt Mackall
merge with stable
Yann E. MORIN
templates/filters: add doctest to the 'person' filter Add a doctest with an hopefuly-comprehensive list of combinations we can expect in real-life situations. This does not cover corner cases, for example when a CR or LF is embedded in the name (allowed by RFC 5322!). Code in tests/test-doctest.py contributed by: Martin Geisler <mg@aragost.com> Thanks! Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Yann E. MORIN
help: strip doctest from dochelp When a dochelp string contains doctest code, the doctest code is not stripped, so the help also displays the doctest. Just stop parsing dochelp at the first hint of a doctest section (starting with >>>). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Matt Mackall
pvec: introduce pvecs
Na'Tosha Bard
largefiles: fix check-code errors.
Na'Tosha Bard
largefiles: remove use of underscores that breaks coding convention
Na'Tosha Bard
largefiles: only update changed largefiles when transplanting
Na'Tosha Bard
largefiles: move calculation of largefiles for updating to utility function
Matt Mackall
posix: disable cygwin's symlink emulation
abudden
posix: ignore execution bit in cygwin (issue3301)
Katsunori FUJIWARA
icasefs: use case preserved root for 'util.fspath()' invocation (issue3302) path to repo root may contains case sensitive part, even though repo is located in case insensitive filesystem: e.g. repo in FAT32 device mounted on Unix. so, case normalized root causes failure of stat(2). this patch uses case preserved root for 'util.fspath()' invocation to avoid this problem. case preserved root for 'util.fspath()' may decrease efficiency of fspath cache, but 'util.fspath()'…
Branches
stable
Matt Mackall
merge: accept missing revisions in symlink flag merge (issue3316)
Branches
stable
Matt Mackall
merge: handle linear update to symlink correctly (issue3316) This fixes a regression introduced by fcf66193b186. If no file-level merge is needed, we can update flags directly, otherwise we have a conflict to resolve in filemerge.
Branches
stable
Matt Mackall
filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 This could result in a traceback.
Branches
stable
Wagner Bruna
strip: enhance repair.strip to receive a list of nodes (issue3299) Originally, mq.strip called repair.strip a single rev at a time. repair.strip stores in a backup bundle any revision greater than the revision being stripped, strips, then restores the backup with repo.addchangegroup. So, when stripping revisions on more than one topological branch, some could end up being restored from the backup bundle, only to be later removed by a subsequent repair.strip call.…
Branches
stable
Johan Samyn
help: add verb to sentence in phases.txt
Branches
stable
Michael Bacarella
localrepo: fix unpushable repos when using bookmarks (issue3317) bookmarks is copied to journal.bookmarks differently from how dirstate is copied to journal.dirstate. The different way is less robust, which can render the repo unpushable by other users if the first pushing user aborts their transaction. The underlying cause is that the copyfile method attempts an unnecessary chmod, which fails if the user is not the owner of the journal.bookmarks file. This …
Branches
stable
Thomas Arendsen Hein
extdiff: escape filenames with vim/DirDiff and make quoting work with Windows Use vim function fnameescape() on filenames. Use double quotes for arguments so cmd.exe is happy.
Branches
stable
Paul Boddie
hgweb: support multi-level repository indexes by enabling descend and collapse The descend option in hgweb can be used to display all reachable repositories within a directory hierarchy if set to True. However, all reachable repositories, regardless of their depth below the root of the hierarchy, are then listed at the same level - expanded - in the hgweb interface. This patch adds support for showing only each level of a directory hierarchy, with subrepositories being shown…
idank
mq: no need to delete undo files after strip repair.strip takes care of that
idank
repair: remove undo files after strip
idank
localrepo: refactor retrieving of journal/undo files paths We'd like to remove undo files after stripping
Yann E. MORIN
templates/filters: strip quotes from {author|person} RFC5322 (Internet Message Format) [0] says that the 'display name' of an internet address [1] (what Mercurial calls 'person') can be quoted with DQUOTE (ASCII 34: ") if it contains non-atom characters [2]. For example, dot '.' is a non-atom character. Also, DQUOTEs in a quoted string will be escaped using "\" [2][3]. The current {author|person} template+filter just extracts the part before an ema…
  1. Prev
  2. Next