| Fri, 13 Nov 2015 14:24:22 -0800 |
Siddharth Agarwal |
merge: stop emptying out 'cd' and 'dc' actions
|
changeset |
files
|
| Sun, 15 Nov 2015 22:18:48 +0100 |
liscju |
rebase: add returning value from pullrebase function
stable
|
changeset |
files
|
| Fri, 13 Nov 2015 15:56:02 -0800 |
Siddharth Agarwal |
resolve: restore .orig only after merge is fully complete (issue4952)
stable
|
changeset |
files
|
| Fri, 06 Nov 2015 22:32:00 +0800 |
Anton Shestakov |
monoblue: add a space to separate navigation links in file log footer
|
changeset |
files
|
| Thu, 12 Nov 2015 13:14:03 -0800 |
Martin von Zweigbergk |
merge: move messages about possible conflicts a litte earlier
|
changeset |
files
|
| Sun, 01 Nov 2015 15:46:06 +0900 |
Yuya Nishihara |
import-checker: include lineno in warning message
|
changeset |
files
|
| Sun, 01 Nov 2015 15:39:25 +0900 |
Yuya Nishihara |
import-checker: extract function to generate a formatted warning
|
changeset |
files
|
| Sun, 01 Nov 2015 13:53:05 +0900 |
Yuya Nishihara |
import-checker: make it executable for convenience
|
changeset |
files
|
| Mon, 09 Nov 2015 17:20:50 -0500 |
Matt Harbison |
test-fileset: glob the updated file count for Windows stability
|
changeset |
files
|
| Mon, 09 Nov 2015 13:12:35 -0500 |
Matt Harbison |
tests: tolerate differences between Linux and Windows error strings
|
changeset |
files
|
| Mon, 09 Nov 2015 12:51:58 -0500 |
Matt Harbison |
test-largefiles-cache: add glob for Windows
|
changeset |
files
|
| Mon, 09 Nov 2015 12:49:31 -0500 |
Matt Harbison |
tests: make 'f' tool open files in binary mode when hexdumping
|
changeset |
files
|
| Thu, 12 Nov 2015 14:29:02 -0800 |
Siddharth Agarwal |
merge.applyupdates: only attempt to merge files in mergeactions
|
changeset |
files
|
| Wed, 11 Nov 2015 17:34:28 -0800 |
Siddharth Agarwal |
filemerge: rename _symlinkcheck to _mergecheck
|
changeset |
files
|
| Wed, 11 Nov 2015 17:32:41 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: rename to test-merge-changedelete.t
|
changeset |
files
|
| Thu, 12 Nov 2015 20:48:41 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Thu, 12 Nov 2015 13:16:04 -0800 |
Gregory Szorc |
tags: create new sortdict for performance reasons
stable
|
changeset |
files
|
| Tue, 10 Nov 2015 15:08:56 -0800 |
Christian Delahousse |
largefiles: specify where .orig files are kept
|
changeset |
files
|
| Tue, 10 Nov 2015 14:52:54 -0800 |
Christian Delahousse |
mq: let the user choose where .orig files are kept
|
changeset |
files
|
| Tue, 10 Nov 2015 14:41:14 -0800 |
Christian Delahousse |
shelve: choose where .orig file locations are kept
|
changeset |
files
|
| Tue, 10 Nov 2015 16:25:59 -0800 |
Christian Delahousse |
filemerge: choose where .orig files are kept
|
changeset |
files
|
| Tue, 10 Nov 2015 14:29:13 -0800 |
Christian Delahousse |
git-subrepos: revert respects specified location to save .orig files
|
changeset |
files
|
| Tue, 10 Nov 2015 14:26:19 -0800 |
Christian Delahousse |
resolve: choose where .orig file locations are kept
|
changeset |
files
|
| Thu, 12 Nov 2015 17:00:08 -0600 |
Christian Delahousse |
revert: allow configuring the .orig file location
|
changeset |
files
|
| Thu, 12 Nov 2015 16:56:06 -0600 |
Christian Delahousse |
cmdutil: add origbackuppath helper
|
changeset |
files
|
| Tue, 10 Nov 2015 11:16:25 -0800 |
Ryan McElroy |
discovery: pass pushop to _nowarnheads
|
changeset |
files
|
| Tue, 10 Nov 2015 11:13:21 -0800 |
Ryan McElroy |
exchange: pass pushop to discovery.checkheads
|
changeset |
files
|
| Thu, 12 Nov 2015 15:26:30 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Fri, 13 Nov 2015 02:36:30 +0900 |
FUJIWARA Katsunori |
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)
stable
|
changeset |
files
|
| Sat, 07 Nov 2015 13:48:42 -0500 |
Pierre-Yves David |
test: use generaldelta in 'test-clonebundle.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 13:14:04 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 13:14:31 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-ssh-bundle1.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 13:09:43 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-strip.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 12:39:49 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-rebase-newancestors.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 12:09:18 +0200 |
Pierre-Yves David |
test: use general delta for 'test-commit-amend.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 11:50:55 +0200 |
Pierre-Yves David |
test: wider matching in 'test-clone-r.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 11:48:49 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-bundle-type.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 10:46:59 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-patchbomb.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 10:37:07 +0200 |
Pierre-Yves David |
test: use generaldelta for test-bundle.t
|
changeset |
files
|
| Tue, 20 Oct 2015 03:14:36 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-rebase-conflict.t'
|
changeset |
files
|
| Mon, 19 Oct 2015 15:25:58 +0200 |
Pierre-Yves David |
tests: test generaldelta configuration in test-init.t
|
changeset |
files
|
| Mon, 19 Oct 2015 11:28:31 +0200 |
Pierre-Yves David |
test: enable generaldelta early in 'test-treemanifest.t'
|
changeset |
files
|
| Mon, 19 Oct 2015 10:48:02 +0200 |
Pierre-Yves David |
test: enable generaldelta in 'test-copy.t'
|
changeset |
files
|
| Sun, 18 Oct 2015 19:04:29 +0200 |
Pierre-Yves David |
test: enable generaldelta in 'test-debugcommand.t'
|
changeset |
files
|
| Sun, 18 Oct 2015 18:55:32 +0200 |
Pierre-Yves David |
test: use generaldelta in test-manifestv2.t
|
changeset |
files
|
| Sun, 18 Oct 2015 18:36:39 +0200 |
Pierre-Yves David |
test: explicitly use generaldelta in 'test-rebase-mq-skip.t'
|
changeset |
files
|
| Fri, 16 Oct 2015 02:54:52 +0100 |
Pierre-Yves David |
test: using generaldelta in 'test-lfconvert.t'
|
changeset |
files
|
| Thu, 12 Nov 2015 02:52:19 -0800 |
Pierre-Yves David |
test: enforce generaldelta format with the right option
|
changeset |
files
|
| Sat, 07 Nov 2015 13:53:11 -0500 |
Pierre-Yves David |
test: enforce non-generaldelta base repository in 'test-generaldelta'
|
changeset |
files
|
| Tue, 20 Oct 2015 12:25:51 +0200 |
Pierre-Yves David |
test: use generaldelta in 'test-hgweb-command.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 12:28:42 +0200 |
Pierre-Yves David |
stream: sort stream capability before serialisation
|
changeset |
files
|
| Tue, 20 Oct 2015 12:25:09 +0200 |
Pierre-Yves David |
test: spread capabilities replies in 'test-hgweb-commands'
|
changeset |
files
|
| Sat, 07 Nov 2015 16:11:49 -0800 |
Durham Goode |
phase: improve retractboundary perf
|
changeset |
files
|
| Thu, 12 Nov 2015 13:51:09 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Mon, 02 Nov 2015 15:59:12 +0000 |
Pierre-Yves David |
format: introduce 'format.usegeneraldelta`
|
changeset |
files
|
| Mon, 02 Nov 2015 16:52:34 +0000 |
Pierre-Yves David |
scmutil: extract general delta config handling in a function
|
changeset |
files
|
| Tue, 10 Nov 2015 09:58:10 -0800 |
Danek Duvall |
test: test-bundle-type.t needs to work more universally
stable
|
changeset |
files
|
| Tue, 10 Nov 2015 19:52:30 +0800 |
Anton Shestakov |
bash_completion: add -p|--patch|--stat support for shelve
|
changeset |
files
|
| Sun, 08 Nov 2015 18:34:36 -0500 |
Matt Harbison |
test-convert-git: silence commit output for stablity
|
changeset |
files
|
| Sun, 08 Nov 2015 17:56:48 -0500 |
Matt Harbison |
rebase: preserve the 'intermediate-source' attribute of grafts
|
changeset |
files
|
| Wed, 11 Nov 2015 15:08:08 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Wed, 04 Nov 2015 12:14:18 -0500 |
Augie Fackler |
verify: add a hook that can let extensions manipulate file lists
|
changeset |
files
|
| Tue, 10 Nov 2015 17:16:59 -0800 |
Siddharth Agarwal |
resolve: don't abort when file is missing
|
changeset |
files
|
| Tue, 10 Nov 2015 17:13:16 -0800 |
Siddharth Agarwal |
filemerge: treat EOF at prompt as fail, not abort
|
changeset |
files
|
| Tue, 10 Nov 2015 17:10:47 -0800 |
Siddharth Agarwal |
test-merge-tools.t: add 'hg resolve --list' output to tests
|
changeset |
files
|
| Tue, 10 Nov 2015 00:46:45 -0800 |
Siddharth Agarwal |
error: add structured exception for EOF at prompt
|
changeset |
files
|
| Mon, 09 Nov 2015 22:37:32 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: unset HGMERGE
|
changeset |
files
|
| Tue, 10 Nov 2015 23:02:59 +0800 |
Anton Shestakov |
hgweb: compute changeset parents and children for log pages lazily
|
changeset |
files
|
| Sun, 08 Nov 2015 23:42:44 -0800 |
Siddharth Agarwal |
filemerge: move :merge-local/other symlink check to precheck
|
changeset |
files
|
| Sun, 08 Nov 2015 23:47:20 -0800 |
Siddharth Agarwal |
test-merge-types.t: add tests for :merge-local/:merge-other with symlinks
|
changeset |
files
|
| Mon, 09 Nov 2015 16:24:13 -0600 |
Matt Mackall |
Added signature for changeset 1aa5083cbebb
stable
|
changeset |
files
|
| Mon, 09 Nov 2015 16:24:08 -0600 |
Matt Mackall |
Added tag 3.6.1 for changeset 1aa5083cbebb
stable
|
changeset |
files
|
| Mon, 09 Nov 2015 15:53:11 -0600 |
Matt Mackall |
posix: fix test-permissions regression
stable 3.6.1
|
changeset |
files
|
| Sun, 08 Nov 2015 01:10:52 +0800 |
Anton Shestakov |
dockerlib: allow non-unique uid and gid of $DBUILDUSER (issue4657)
stable
|
changeset |
files
|
| Mon, 09 Nov 2015 10:43:23 -0800 |
Mateusz Kwapich |
dirstate: fix filefoldmap incosistency on file delete
stable
|
changeset |
files
|
| Mon, 09 Nov 2015 09:41:20 -0600 |
Steve Borho |
wix: style-coal.css has been renamed
stable
|
changeset |
files
|
| Mon, 09 Nov 2015 12:49:21 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Thu, 05 Nov 2015 10:31:20 +0000 |
Javi Merino |
clonebundles: fix typo s/comand/command/
stable
|
changeset |
files
|
| Fri, 06 Nov 2015 15:23:10 -0600 |
Matt Mackall |
posix: retry on symlink race in checklink
stable
|
changeset |
files
|
| Fri, 06 Nov 2015 13:01:15 -0500 |
Pierre-Yves David |
changegroup: back code change of e7c618cee8df out
stable
|
changeset |
files
|
| Fri, 06 Nov 2015 12:59:09 -0500 |
Pierre-Yves David |
changegroup: call 'prechangegroup' hook before setting up write delay
stable
|
changeset |
files
|
| Fri, 06 Nov 2015 12:39:06 -0500 |
Pierre-Yves David |
changegroup: fix the scope of a try finally
stable
|
changeset |
files
|
| Thu, 05 Nov 2015 17:30:10 -0600 |
Matt Mackall |
encoding: re-escape U+DCxx characters in toutf8b input (issue4927)
|
changeset |
files
|
| Thu, 05 Nov 2015 17:21:43 -0600 |
Matt Mackall |
encoding: use getutf8char in toutf8b
|
changeset |
files
|
| Thu, 05 Nov 2015 17:11:50 -0600 |
Matt Mackall |
encoding: handle non-BMP characters in fromutf8b
|
changeset |
files
|
| Thu, 05 Nov 2015 17:09:00 -0600 |
Matt Mackall |
posix: use getutf8char to handle OS X filename percent-escaping
|
changeset |
files
|
| Thu, 05 Nov 2015 16:48:46 -0600 |
Matt Mackall |
encoding: add getutf8char helper
|
changeset |
files
|
| Sat, 07 Nov 2015 16:03:09 -0500 |
Pierre-Yves David |
unbundle: gratuitous fix white spacing "issue"
|
changeset |
files
|
| Sun, 01 Nov 2015 21:19:09 +0900 |
Yuya Nishihara |
demandimport: fix level passed to loader of sub-modules
stable
|
changeset |
files
|
| Sat, 07 Nov 2015 17:43:20 +0900 |
Yuya Nishihara |
parsers: fix width of datalen variable in fm1readmarkers
stable
|
changeset |
files
|
| Thu, 05 Nov 2015 18:56:40 -0800 |
Durham Goode |
manifest: skip fastdelta if the change is large
|
changeset |
files
|
| Wed, 04 Nov 2015 23:44:51 -0800 |
Siddharth Agarwal |
merge.mergestate: update docstrings for preresolve and resolve
|
changeset |
files
|
| Mon, 26 Oct 2015 02:35:48 -0700 |
Stanislau Hlebik |
rebase: pass date parameter to concludenode
|
changeset |
files
|
| Mon, 26 Oct 2015 02:22:26 -0700 |
Stanislau Hlebik |
rebase: add date parameter to concludenode function
|
changeset |
files
|
| Sat, 24 Oct 2015 09:47:33 +0100 |
Anton Shestakov |
hgweb: remove unused colorPart() from mercurial.js
|
changeset |
files
|
| Sun, 18 Oct 2015 18:49:59 +0200 |
Pierre-Yves David |
test: enforce non-general delta in 'test-generaldelta.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 15:27:56 +0200 |
Pierre-Yves David |
test: enforce bundle1 in 'test-push-cgi.t'
|
changeset |
files
|
| Sun, 18 Oct 2015 18:42:09 +0200 |
Pierre-Yves David |
test: enforce v1 in 'test-debugbundle.t'
|
changeset |
files
|
| Tue, 20 Oct 2015 02:39:42 +0200 |
Pierre-Yves David |
test: enforce bundle1 in "test-commit-interactive.t"
|
changeset |
files
|
| Fri, 06 Nov 2015 09:48:24 -0800 |
Ryan McElroy |
discovery: factor out calculation of heads to not warn about
|
changeset |
files
|
| Fri, 06 Nov 2015 11:08:11 -0500 |
Pierre-Yves David |
hooks: back 9f272bf3b342 out
stable
|
changeset |
files
|
| Wed, 04 Nov 2015 15:17:52 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
| Tue, 03 Nov 2015 17:13:27 -0800 |
Durham Goode |
hooks: fix hooks not firing if prechangegroup was set (issue4934)
stable
|
changeset |
files
|
| Tue, 03 Nov 2015 16:58:13 -0800 |
Durham Goode |
hooks: always include HG_PENDING
stable
|
changeset |
files
|
| Tue, 03 Nov 2015 12:31:33 -0800 |
Gregory Szorc |
wireproto: move clonebundles command from extension (issue4931)
stable
|
changeset |
files
|
| Wed, 04 Nov 2015 23:48:15 +0900 |
Yuya Nishihara |
templatefilters: try round-trip utf-8 conversion by json filter (issue4933)
stable
|
changeset |
files
|
| Tue, 03 Nov 2015 12:16:54 -0800 |
Gregory Szorc |
exchange: do not attempt clone bundle if local repo is non-empty (issue4932)
stable
|
changeset |
files
|
| Tue, 03 Nov 2015 12:15:14 -0800 |
Gregory Szorc |
test-clonebundles.t: add test for incremental pull
stable
|
changeset |
files
|
| Tue, 03 Nov 2015 22:44:57 +0900 |
Yuya Nishihara |
i18n: make sure to include translation of (DEPRECATED)
stable
|
changeset |
files
|
| Tue, 03 Nov 2015 22:39:26 +0900 |
Yuya Nishihara |
i18n: do not abuse msgstr of "DEPRECATED" to check for bad translation
stable
|
changeset |
files
|
| Mon, 02 Nov 2015 12:12:24 -0800 |
Siddharth Agarwal |
filemerge.prompt: separate out choice selection and action
|
changeset |
files
|
| Mon, 02 Nov 2015 12:25:15 -0800 |
Siddharth Agarwal |
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
|
changeset |
files
|
| Sat, 24 Oct 2015 16:25:16 -0700 |
Siddharth Agarwal |
test-pathencode.py: drop support for Python 2.4
|
changeset |
files
|
| Sat, 24 Oct 2015 16:23:42 -0700 |
Siddharth Agarwal |
hgweb.server: drop support for Python 2.4
|
changeset |
files
|
| Sat, 24 Oct 2015 15:56:16 -0700 |
Siddharth Agarwal |
util: drop Python 2.4 compat by directly importing md5 and sha1
|
changeset |
files
|
| Mon, 02 Nov 2015 23:37:49 +0800 |
Anton Shestakov |
hgweb: replace some str.split() calls by str.partition() or str.rpartition()
|
changeset |
files
|
| Mon, 02 Nov 2015 23:37:14 +0800 |
Anton Shestakov |
help: replace some str.split() calls by str.partition() or str.rpartition()
|
changeset |
files
|
| Sat, 24 Oct 2015 01:54:46 +0200 |
Mads Kiilerich |
convert: test clean p2 file missing
|
changeset |
files
|
| Mon, 02 Nov 2015 11:56:59 +0000 |
Pierre-Yves David |
uescape: also encode non-printable char under 128
|
changeset |
files
|
| Sat, 24 Oct 2015 12:46:03 +0100 |
David R. MacIver |
testing: add hypothesis fuzz testing
|
changeset |
files
|