| 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
|
| Mon, 02 Nov 2015 13:00:45 +0000 |
Pierre-Yves David |
merge with stable
|
changeset |
files
|
| Sun, 01 Nov 2015 13:04:14 -0600 |
Matt Mackall |
Added signature for changeset 47dd34f2e727
stable
|
changeset |
files
|
| Sun, 01 Nov 2015 13:04:09 -0600 |
Matt Mackall |
Added tag 3.6 for changeset 47dd34f2e727
stable
|
changeset |
files
|
| Sun, 01 Nov 2015 08:38:56 +0900 |
FUJIWARA Katsunori |
i18n: look translation of both "DEPRECATED" and "(DEPRECATED)" up
stable 3.6
|
changeset |
files
|
| Sun, 01 Nov 2015 08:38:56 +0900 |
FUJIWARA Katsunori |
i18n: fix regexp pattern to detect translation for DEPRECATED
stable
|
changeset |
files
|
| Sat, 31 Oct 2015 21:45:46 -0400 |
Matt Harbison |
scmutil: abort if an empty revision is given to revpair()
stable
|
changeset |
files
|
| Sun, 01 Nov 2015 15:24:57 -0200 |
Wagner Bruna |
i18n-pt_BR: synchronized with a9ed5a8fc5e0
stable
|
changeset |
files
|
| Sun, 01 Nov 2015 05:34:27 +0900 |
FUJIWARA Katsunori |
i18n-ja: synchronized with 6474b64045fb
stable
|
changeset |
files
|
| Mon, 26 Oct 2015 14:19:37 -0400 |
Augie Fackler |
packaging: rework version detection and declaration (issue4912)
stable
|
changeset |
files
|
| Tue, 27 Oct 2015 12:34:05 +0800 |
Anton Shestakov |
hgweb: escape class keyword when used as a js object property (issue4913)
stable
|
changeset |
files
|
| Sat, 24 Oct 2015 18:58:57 +0900 |
FUJIWARA Katsunori |
localrepo: discard objects in _filecache at transaction failure (issue4876)
stable
|
changeset |
files
|
| Wed, 28 Oct 2015 16:27:09 +0100 |
Gábor Stefanik |
demandimport: fix TypeError when importing Python regex library (issue4920)
stable
|
changeset |
files
|
| Sat, 24 Oct 2015 00:39:22 +0100 |
Gregory Szorc |
bundle2: attribute remote failures to remote (issue4788)
stable
|
changeset |
files
|
| Sat, 24 Oct 2015 00:39:26 +0100 |
Gregory Szorc |
tests: add tests for remote hook output (issue4788)
stable
|
changeset |
files
|
| Sat, 24 Oct 2015 06:59:26 +0100 |
Yuya Nishihara |
help: mention alias and revsetalias in description of HGPLAINEXCEPT
stable
|
changeset |
files
|
| Fri, 23 Oct 2015 11:04:53 -0400 |
Augie Fackler |
debugrevlog: cope with empty revlog files
stable
|
changeset |
files
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: don't mute and obfuscate http errors when putlfile fails
stable
|
changeset |
files
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: test coverage of error handling from putlfile
stable
|
changeset |
files
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: check hash of files in the store before copying to working dir
stable
|
changeset |
files
|
| Fri, 23 Oct 2015 21:27:29 +0200 |
Mads Kiilerich |
largefiles: test coverage of handling of store corruption
stable
|
changeset |
files
|
| Fri, 23 Oct 2015 06:06:22 -0400 |
Augie Fackler |
merge: improve clarity of table in update docstring
stable
|
changeset |
files
|
| Thu, 22 Oct 2015 18:59:03 +0000 |
Gregory Szorc |
ui: support paths.default-push without paths.default set (issue4914)
stable
|
changeset |
files
|
| Wed, 21 Oct 2015 16:21:27 -0500 |
Matt Mackall |
bookmarks: don't allow pushing new head for existing mark with -B (issue4400)
stable
|
changeset |
files
|
| Tue, 20 Oct 2015 18:46:00 -0400 |
timeless |
commands: fix help for debugobsolete
stable
|
changeset |
files
|
| Wed, 21 Oct 2015 00:18:11 +0200 |
Mads Kiilerich |
largefiles: fix explicit commit of normal/largefile switch
stable
|
changeset |
files
|
| Wed, 21 Oct 2015 00:10:46 +0200 |
Mads Kiilerich |
largefiles: test coverage of explicit commit of normal/largefile switch
stable
|
changeset |
files
|
| Tue, 20 Oct 2015 16:00:02 -0500 |
Matt Mackall |
Added signature for changeset b66e3ca0b90c
stable
|
changeset |
files
|
| Tue, 20 Oct 2015 15:59:58 -0500 |
Matt Mackall |
Added tag 3.6-rc for changeset b66e3ca0b90c
stable
|
changeset |
files
|
| Tue, 20 Oct 2015 15:59:10 -0500 |
Matt Mackall |
merge default into stable for code freeze
stable 3.6-rc
|
changeset |
files
|
| Mon, 19 Oct 2015 16:49:54 +0200 |
Mads Kiilerich |
convert: fix Python syntax in 'splice in' message
|
changeset |
files
|
| Mon, 19 Oct 2015 16:29:35 +0200 |
Mads Kiilerich |
rebase: fix wrong 'no changes to commit' when using --collapse
|
changeset |
files
|
| Mon, 19 Oct 2015 15:47:40 -0700 |
Sean Farley |
pull: all pass along extra opargs
|
changeset |
files
|
| Mon, 19 Oct 2015 15:43:35 -0700 |
Sean Farley |
push: all pass along opargs
|
changeset |
files
|
| Thu, 15 Oct 2015 17:28:26 -0400 |
timeless |
check-code: allow argument passing py2.6ism
|
changeset |
files
|
| Thu, 15 Oct 2015 17:24:42 -0400 |
timeless |
mail: drop python 2.5 self.sock.read workaround
|
changeset |
files
|
| Thu, 15 Oct 2015 17:21:08 -0400 |
timeless |
url: drop support for python2.5
|
changeset |
files
|
| Thu, 15 Oct 2015 17:19:11 -0400 |
timeless |
win32: drop reference to python2.5
|
changeset |
files
|
| Mon, 19 Oct 2015 21:36:12 -0700 |
Ryan McElroy |
editmerge: dequote other use of $ED
|
changeset |
files
|
| Mon, 19 Oct 2015 16:01:55 +0200 |
Pierre-Yves David |
bundlerepo: properly extract compressed changegroup from bundle2
|
changeset |
files
|
| Fri, 02 Oct 2015 23:21:39 -0700 |
Pierre-Yves David |
bundle2: make unbundle.compressed return True when compressed
|
changeset |
files
|
| Mon, 19 Oct 2015 18:04:08 +0200 |
Pierre-Yves David |
bundlerepo: uncompress changegroup in bundle1 case only
|
changeset |
files
|
| Mon, 19 Oct 2015 17:58:04 +0200 |
Pierre-Yves David |
bundlerepo: move temp-bundle writing logic into a closure
|
changeset |
files
|
| Mon, 19 Oct 2015 15:42:50 +0200 |
Pierre-Yves David |
shelve: properly process bundle2 bundle
|
changeset |
files
|
| Tue, 20 Oct 2015 03:07:23 +0200 |
Pierre-Yves David |
histedit: properly apply bundle2 backups
|
changeset |
files
|
| Tue, 20 Oct 2015 16:01:33 +0200 |
Pierre-Yves David |
strip: pass source and url to bundle2 processing
|
changeset |
files
|
| Tue, 20 Oct 2015 15:56:22 +0200 |
Pierre-Yves David |
unbundle: use 'url' argument with applybundle
|
changeset |
files
|
| Tue, 20 Oct 2015 15:55:04 +0200 |
Pierre-Yves David |
applybundle: take url as argument
|
changeset |
files
|
| Tue, 20 Oct 2015 15:53:07 +0200 |
Pierre-Yves David |
unbundle: use 'source' argument with applybundle
|
changeset |
files
|
| Tue, 20 Oct 2015 15:52:42 +0200 |
Pierre-Yves David |
applybundle: take source as argument
|
changeset |
files
|
| Tue, 20 Oct 2015 15:48:24 +0200 |
Pierre-Yves David |
applybundle: set 'bundle2=1' env for all transaction
|
changeset |
files
|
| Tue, 20 Oct 2015 15:47:20 +0200 |
Pierre-Yves David |
unbundle: use 'bundle2.applybundle'
|
changeset |
files
|
| Tue, 20 Oct 2015 15:45:39 +0200 |
Pierre-Yves David |
bundle2: introduce an "applybundle" function
|
changeset |
files
|
| Thu, 15 Oct 2015 01:31:04 -0700 |
Siddharth Agarwal |
commands.resolve: conclude merge driver if no unresolved files are left
|
changeset |
files
|
| Thu, 15 Oct 2015 01:27:06 -0700 |
Siddharth Agarwal |
commands.resolve: call driverpreprocess if we haven't run it yet
|
changeset |
files
|
| Thu, 15 Oct 2015 01:22:01 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverconclude after performing merge actions
|
changeset |
files
|
| Thu, 15 Oct 2015 01:19:10 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverpreprocess before starting merge actions
|
changeset |
files
|
| Thu, 15 Oct 2015 01:17:29 -0700 |
Siddharth Agarwal |
merge: add stubs for preprocess and conclude steps of merge driver
|
changeset |
files
|
| Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
changeset |
files
|
| Thu, 15 Oct 2015 01:11:50 -0700 |
Siddharth Agarwal |
resolve: only create wctx once
|
changeset |
files
|
| Mon, 19 Oct 2015 12:07:17 -0700 |
James Mills |
dirstate: fix invalid reference to self.ui
|
changeset |
files
|
| Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
changeset |
files
|
| Wed, 14 Oct 2015 03:30:27 -0400 |
timeless |
mq: consistently use qrefresh
|
changeset |
files
|
| Wed, 14 Oct 2015 02:06:54 -0400 |
timeless |
grammar: use does instead of do where appropriate
|
changeset |
files
|
| Wed, 14 Oct 2015 22:29:03 -0400 |
timeless |
l10n: use %d instead of %s for numbers
|
changeset |
files
|
| Thu, 15 Oct 2015 20:36:12 -0400 |
timeless |
check-code: block non-portable pipe-and
|
changeset |
files
|
| Thu, 15 Oct 2015 20:32:01 -0400 |
timeless |
test-shelve: do not use non-portable pipe-and
|
changeset |
files
|