Thu, 15 Oct 2015 01:19:10 -0700 |
Siddharth Agarwal |
merge.applyupdates: call driverpreprocess before starting merge actions
|
Thu, 15 Oct 2015 01:17:29 -0700 |
Siddharth Agarwal |
merge: add stubs for preprocess and conclude steps of merge driver
|
Thu, 15 Oct 2015 01:15:22 -0700 |
Siddharth Agarwal |
commands.resolve: don't allow users to mark or unmark driver-resolved files
|
Thu, 15 Oct 2015 01:11:50 -0700 |
Siddharth Agarwal |
resolve: only create wctx once
|
Mon, 19 Oct 2015 12:07:17 -0700 |
James Mills |
dirstate: fix invalid reference to self.ui
|
Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
Wed, 14 Oct 2015 03:30:27 -0400 |
timeless |
mq: consistently use qrefresh
|
Wed, 14 Oct 2015 02:06:54 -0400 |
timeless |
grammar: use does instead of do where appropriate
|
Wed, 14 Oct 2015 22:29:03 -0400 |
timeless |
l10n: use %d instead of %s for numbers
|
Thu, 15 Oct 2015 20:36:12 -0400 |
timeless |
check-code: block non-portable pipe-and
|
Thu, 15 Oct 2015 20:32:01 -0400 |
timeless |
test-shelve: do not use non-portable pipe-and
|
Sun, 18 Oct 2015 09:05:04 +0900 |
Yuya Nishihara |
parsers: suppress warning of signed and unsigned comparison at nt_init
|
Sat, 17 Oct 2015 23:14:13 +0900 |
Yuya Nishihara |
parsers: correct type of temporary variables for dirstate tuple fields
|
Fri, 16 Oct 2015 02:53:57 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
|
Fri, 16 Oct 2015 02:51:34 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-format.t'
|
Sat, 17 Oct 2015 15:48:14 -0700 |
Ryan McElroy |
editmerge: properly quote variables
|
Thu, 15 Oct 2015 01:09:58 -0700 |
Siddharth Agarwal |
commands.resolve: print out warning when only driver-resolved files remain
|
Thu, 15 Oct 2015 01:06:29 -0700 |
Siddharth Agarwal |
merge.mergestate: set merge driver state to 's' if there's none present
|
Thu, 15 Oct 2015 01:04:46 -0700 |
Siddharth Agarwal |
merge.mergestate: only check for merge driver when property is accessed
|
Thu, 15 Oct 2015 01:02:32 -0700 |
Siddharth Agarwal |
localrepo.commit: abort if merge driver's conclude step hasn't been run yet
|
Thu, 15 Oct 2015 00:57:56 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the merge driver state
|
Thu, 15 Oct 2015 00:49:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the other side of the merge
|
Thu, 15 Oct 2015 00:45:20 -0700 |
Siddharth Agarwal |
commands.resolve: support printing out driver-resolved files
|
Sat, 17 Oct 2015 12:32:23 -0700 |
Durham Goode |
histedit: make histedit prune when obsolete is enabled
|
Sat, 17 Oct 2015 11:23:54 -0700 |
Gregory Szorc |
clonebundles: rewrite documentation
|
Sat, 17 Oct 2015 11:37:08 -0700 |
Gregory Szorc |
exchange: support streaming clone bundles in clone bundles
|
Sat, 17 Oct 2015 10:26:34 -0700 |
Gregory Szorc |
exchange: parse requirements from stream clone specification string
|
Wed, 14 Oct 2015 17:00:34 -0700 |
Gregory Szorc |
exchange: support parameters in bundle specification strings
|
Thu, 15 Oct 2015 13:43:18 -0700 |
Gregory Szorc |
commands: support consuming stream clone bundles
|
Sat, 17 Oct 2015 11:40:29 -0700 |
Gregory Szorc |
commands: support creating stream clone bundles
|
Thu, 15 Oct 2015 13:00:45 -0700 |
Gregory Szorc |
exchange: support for streaming clone bundles
|
Sat, 17 Oct 2015 11:14:52 -0700 |
Gregory Szorc |
streamclone: support for producing and consuming stream clone bundles
|
Sat, 17 Oct 2015 15:28:02 -0500 |
Matt Mackall |
spelling: fix typo in transaction error messages
|
Fri, 16 Oct 2015 03:29:51 +0900 |
FUJIWARA Katsunori |
transaction: reorder unlinking .hg/journal and .hg/journal.backupfiles
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
merge: make in-memory changes visible to external update hooks
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
hook: centralize passing HG_PENDING to external hook process
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
cmdutil: make in-memory changes visible to external editor (issue4378)
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: show develwarn for write() invocation without transaction
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: make dirstate.write() callers pass transaction object to it
|
Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: remove layering violation around writing dirstate out
|
Sat, 17 Oct 2015 01:15:33 +0900 |
FUJIWARA Katsunori |
dirstateguard: remove layering violation around saving/restoring backup
|
Thu, 15 Oct 2015 15:20:44 -0700 |
Christian Delahousse |
rebase: reduce scope of try catch in restorestate
|
Thu, 15 Oct 2015 12:13:46 -0700 |
Christian Delahousse |
rebase: on abort delete rebase state file no matter what
|
Fri, 16 Oct 2015 15:01:42 -0700 |
Christian Delahousse |
contrib: make editmerge look for merge markers at the beginning of the line
|
Fri, 09 Oct 2015 21:44:54 -0700 |
Tony Tung |
commit: abort when a committemplate is not changed
|
Wed, 14 Oct 2015 16:04:43 -0700 |
Siddharth Agarwal |
localrepo.commit: disallow commit when driver-resolved files exist
|
Wed, 14 Oct 2015 15:01:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a generator for driver-resolved files
|
Wed, 14 Oct 2015 16:27:10 -0700 |
Siddharth Agarwal |
hook: for python hooks, also return whether an exception was raised
|
Wed, 14 Oct 2015 16:19:47 -0700 |
Siddharth Agarwal |
hook.runhooks: return a dict of result values
|
Wed, 14 Oct 2015 16:13:31 -0700 |
Siddharth Agarwal |
hook: factor out determination of hooks from running them
|
Tue, 10 Mar 2015 13:19:17 +0100 |
Mads Kiilerich |
mq: generate patch names from first line of description
|
Thu, 15 Oct 2015 21:36:47 +0200 |
Mads Kiilerich |
contrib: offer Python 2.7.10
|
Thu, 15 Oct 2015 21:35:49 +0200 |
Mads Kiilerich |
contrib: drop Python < 2.6 from Makefile.python
|
Fri, 16 Oct 2015 11:37:34 +0200 |
Mads Kiilerich |
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
|
Thu, 15 Oct 2015 14:53:32 -0700 |
Gregory Szorc |
exchange: don't print error codes after clone bundle failure
|
Wed, 14 Oct 2015 14:53:15 -0400 |
Augie Fackler |
debian: install bash completion as hg and not mercurial (issue4900)
|
Wed, 14 Oct 2015 12:57:33 -0400 |
Augie Fackler |
merge-tools: allow marking a mergetool as completely disabled
|
Tue, 13 Oct 2015 23:04:53 -0700 |
Sean Farley |
exchange: add oparg to push so that extensions can wrap pushop
|
Thu, 15 Oct 2015 03:15:54 +0100 |
Pierre-Yves David |
destmerge: extract logic based on branch heads in its own function
|
Thu, 15 Oct 2015 03:13:14 +0100 |
Pierre-Yves David |
destmerge: extract logic based on bookmark into its own function
|