| 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
|
| Sun, 18 Oct 2015 09:05:04 +0900 |
Yuya Nishihara |
parsers: suppress warning of signed and unsigned comparison at nt_init
|
changeset |
files
|
| Sat, 17 Oct 2015 23:14:13 +0900 |
Yuya Nishihara |
parsers: correct type of temporary variables for dirstate tuple fields
|
changeset |
files
|
| Fri, 16 Oct 2015 02:53:57 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-remote-changegroup.t'
|
changeset |
files
|
| Fri, 16 Oct 2015 02:51:34 +0100 |
Pierre-Yves David |
test: enforce v1 type in 'test-bundle2-format.t'
|
changeset |
files
|
| Sat, 17 Oct 2015 15:48:14 -0700 |
Ryan McElroy |
editmerge: properly quote variables
|
changeset |
files
|
| Thu, 15 Oct 2015 01:09:58 -0700 |
Siddharth Agarwal |
commands.resolve: print out warning when only driver-resolved files remain
|
changeset |
files
|
| Thu, 15 Oct 2015 01:06:29 -0700 |
Siddharth Agarwal |
merge.mergestate: set merge driver state to 's' if there's none present
|
changeset |
files
|
| Thu, 15 Oct 2015 01:04:46 -0700 |
Siddharth Agarwal |
merge.mergestate: only check for merge driver when property is accessed
|
changeset |
files
|
| Thu, 15 Oct 2015 01:02:32 -0700 |
Siddharth Agarwal |
localrepo.commit: abort if merge driver's conclude step hasn't been run yet
|
changeset |
files
|
| Thu, 15 Oct 2015 00:57:56 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the merge driver state
|
changeset |
files
|
| Thu, 15 Oct 2015 00:49:07 -0700 |
Siddharth Agarwal |
merge.mergestate: add a way to get the other side of the merge
|
changeset |
files
|
| Thu, 15 Oct 2015 00:45:20 -0700 |
Siddharth Agarwal |
commands.resolve: support printing out driver-resolved files
|
changeset |
files
|
| Sat, 17 Oct 2015 12:32:23 -0700 |
Durham Goode |
histedit: make histedit prune when obsolete is enabled
|
changeset |
files
|
| Sat, 17 Oct 2015 11:23:54 -0700 |
Gregory Szorc |
clonebundles: rewrite documentation
|
changeset |
files
|
| Sat, 17 Oct 2015 11:37:08 -0700 |
Gregory Szorc |
exchange: support streaming clone bundles in clone bundles
|
changeset |
files
|
| Sat, 17 Oct 2015 10:26:34 -0700 |
Gregory Szorc |
exchange: parse requirements from stream clone specification string
|
changeset |
files
|
| Wed, 14 Oct 2015 17:00:34 -0700 |
Gregory Szorc |
exchange: support parameters in bundle specification strings
|
changeset |
files
|
| Thu, 15 Oct 2015 13:43:18 -0700 |
Gregory Szorc |
commands: support consuming stream clone bundles
|
changeset |
files
|
| Sat, 17 Oct 2015 11:40:29 -0700 |
Gregory Szorc |
commands: support creating stream clone bundles
|
changeset |
files
|
| Thu, 15 Oct 2015 13:00:45 -0700 |
Gregory Szorc |
exchange: support for streaming clone bundles
|
changeset |
files
|
| Sat, 17 Oct 2015 11:14:52 -0700 |
Gregory Szorc |
streamclone: support for producing and consuming stream clone bundles
|
changeset |
files
|
| Sat, 17 Oct 2015 15:28:02 -0500 |
Matt Mackall |
spelling: fix typo in transaction error messages
|
changeset |
files
|