Re: [PATCH 1/3] for-each-ref: introduce %C(...) for color

On Fri, May 24, 2013 at 10:19 AM, Ramkumar Ramachandra wrote: > Since 'git branch' misses important options like --sort, --count, and > --format that are present in 'git for-each-ref'. Until we are in a > position to fix 'git branch', let us enhance the 'git for-each-ref' > format so it can atlea

Re: [PATCH v2 25/48] remote-hg: add test for diverged push

On Fri, May 24, 2013 at 10:29 PM, Felipe Contreras wrote: > Neither mercurial nor git allows pushing to a remote when it's a > non-fast-forward push. We should be able to detect theses errors and s/theses/these/ > report them properly. > > As opposed to throwing an exception stack-trace. > > Sig

Re: [PATCH v2 27/48] remote-hg: add test for new bookmark special

On Fri, May 24, 2013 at 10:29 PM, Felipe Contreras wrote: > From the point of view of Mercurial, this creates a new branch head, and > requires a forced push. > > Ideally, whoever, we would want it to work just like in git; new s/whoever/however/ > branches can be pushed without problems. > > Si

Re: [PATCH 5/9] fast-export: add new --refspec option

On Fri, May 24, 2013 at 10:47 PM, Felipe Contreras wrote: > So that we can covert the exported ref names. s/covert/convert/ > Signed-off-by: Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo in

Re: [PATCH v2 0/3] Towards a useable git-branch

On Sat, May 25, 2013 at 5:51 AM, Duy Nguyen wrote: > I just had an idea that might bring pretty stuff to for-each-ref with > probably reasonable effort, making for-each-ref format a superset of > pretty. But I need to clean up my backlog first. Give me a few days, I > will show you something (or g

[no subject]

git unsubscribe -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] send-email: remove warning about unset chainreplyto

Three years and a half is probably more than enough time to give users the opportunity to configure Git to do what they want. If they haven't changed the configuration by now, this warning message is not going to do anything for them anyway. This effectively reverts commit 528fb08 (prepare send-em

[PATCH] completion: zsh: improve bash script loading

It's better to check in multiple locations, so the user doesn't have to. And update the documentation. Signed-off-by: Felipe Contreras --- contrib/completion/git-completion.zsh | 26 ++ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/contrib/completion/git

[PATCH 9/9] transport-helper: add support to delete branches

For remote-helpers that use 'export' to push. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 8 transport-helper.c| 11 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 6a7db

[PATCH 8/9] fast-export: add support to delete refs

Signed-off-by: Felipe Contreras --- builtin/fast-export.c | 14 ++ t/t9350-fast-export.sh | 11 +++ 2 files changed, 25 insertions(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index ba4b0ba..8db00a8 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-expor

[PATCH 6/9] transport-helper: add support for old:new refspec

By using fast-export's new --refspec option. Signed-off-by: Felipe Contreras --- t/t5801-remote-helpers.sh | 2 +- transport-helper.c| 14 -- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 4899af3..

[PATCH 7/9] fast-import: add support to delete refs

Signed-off-by: Felipe Contreras --- Documentation/git-fast-import.txt | 3 +++ fast-import.c | 13 ++--- t/t9300-fast-import.sh| 18 ++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Doc

[PATCH 5/9] fast-export: add new --refspec option

So that we can covert the exported ref names. Signed-off-by: Felipe Contreras --- Documentation/git-fast-export.txt | 4 builtin/fast-export.c | 30 ++ t/t9350-fast-export.sh| 7 +++ 3 files changed, 41 insertions(+) diff --git a/Do

[PATCH 4/9] fast-export: improve argument parsing

We don't want to pass arguments specific to fast-export to setup_revisions. Signed-off-by: Felipe Contreras --- builtin/fast-export.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index d1d68e9..3e1c4d4 100644 --- a/builtin/fa

[PATCH 3/9] transport-helper: check for 'forced update' message

So the remote-helpers can tell us when a forced push was needed. Signed-off-by: Felipe Contreras --- transport-helper.c | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index 22f31a2..e461764 100644 --- a/transport-helper.c +++ b/

[PATCH 2/9] transport-helper: add 'force' to 'export' helpers

Otherwise they cannot know when to force the push or not (other than hacks). Signed-off-by: Felipe Contreras --- transport-helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/transport-helper.c b/transport-helper.c index 85c951f..22f31a2 100644 --- a/transport-helper.c +++ b/transpor

[PATCH 1/9] transport-helper: check if the dry-run is supported

Certain remote-helpers (the ones with 'export') would try to push regardless. Obviously this is not what the user wants. Also, add a check for the 'dry-run' option, so remote-helpers can implement it. Signed-off-by: Felipe Contreras --- transport-helper.c | 5 + 1 file changed, 5 insertion

[PATCH 0/9] transport-helper: a bunch of improvements

Hi, After these remote helpers that use 'export' are able to do everything: 1) push --dry-run 2) push --force 2.1) report which branches were forced 3) push old:new 4) push :to-delete I know these won't be applied, which is too bad for the users, which could enjoy these features, which are

[PATCH 5/6] build: add NO_INSTALL variable

So that we can specify which scripts we do not want to install (they are for testing). Signed-off-by: Felipe Contreras --- Makefile | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 97ff848..333b5d3 100644 --- a/Makefile +++ b/Makefil

[PATCH 6/6] build: do not install git-remote-testpy

It's only meant for testing. Signed-off-by: Felipe Contreras --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 333b5d3..ad70d45 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,8 @@ SCRIPT_PERL += git-svn.perl SCRIPT_PYTHON += git-remote-testpy.py

[PATCH 4/6] build: be clearer about order-only prerequisites

Signed-off-by: Felipe Contreras --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 28b6117..97ff848 100644 --- a/Makefile +++ b/Makefile @@ -1787,7 +1787,7 @@ perl/PM.stamp: FORCE perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile per

[PATCH 2/6] build: cleanup using $^

There's no need to list again the prerequisites. No functional changes. Signed-off-by: Felipe Contreras --- Makefile | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2704df4..1ac52dd 100644 --- a/Makefile +++ b/Makefile @@ -510,11 +510,11 @@ b

[PATCH 3/6] build: cleanup using $

No need to list the first prerequisite. No functional changes. Signed-off-by: Felipe Contreras --- Makefile | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1ac52dd..28b6117 100644 --- a/Makefile +++ b/Makefile @@ -1731,9 +1731,9 @@ version

[PATCH 1/6] build: trivial simplification

SCRIPT_PYTHON_GEN is '$(patsubst %.py,%,$(SCRIPT_PYTHON))', so replace '$(patsubst %.py,%,$(SCRIPT_PYTHON))' with it Signed-off-by: Felipe Contreras --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 985598b..2704df4 100644 --- a/Make

[PATCH 0/6] build: cleanups

Hi, Here's a bunch of cleanups, after which it's trivial to avoid the installation of test scripts, namely git-remote-testpy. Felipe Contreras (6): build: trivial simplification build: cleanup using $^ build: cleanup using $< build: be clearer about order-only prerequisites build: add N

[PATCH 3/4] remote-helpers: allow direct test execution

Previously 'make' was the only option, or manually specifying the 'TEST_DIRECTORY'. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/Makefile | 1 + contrib/remote-helpers/test-bzr.t | 3 ++- contrib/remote-helpers/test-hg-bidi.t | 3 ++- contrib/remote-helpers/test-hg-

[PATCH 4/4] remote-helpers: add exec-path links

This way we don't have to modify the PATH ourselves and it's easier to test without 'make'. Signed-off-by: Felipe Contreras --- .gitignore | 2 ++ contrib/remote-helpers/Makefile | 13 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore

[PATCH 2/4] remote-helpers: rename tests

The .t extension is more standard for sharness tests. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/Makefile| 2 +- contrib/remote-helpers/{test-bzr.sh => test-bzr.t} | 0 contrib/remote-helpers/{test-hg-bidi.sh => test-hg-bidi.t} | 0

[PATCH 1/4] remote-helpers: generate scripts

The same way other python scripts are generated, so the shebang is replaced by PYTHON_PATH. Also, cleanup the Makefile. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/.gitignore | 2 ++ contrib/remote-helpers/Makefile | 15 +

[PATCH 0/4] remote-helpers: test reorganization

Now we use PYTHON_PATH properly, and also we are able to do: make -C contrib/remote-helpers install Felipe Contreras (4): remote-helpers: generate scripts remote-helpers: rename tests remote-helpers: allow direct test execution remote-helpers: add exec-path links .gitignore

[PATCH v2 48/48] remote-hg: add support for --force

And get rid of the remote-hg.force-push option hack. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 30 +- contrib/remote-helpers/test-hg.sh| 33 + 2 files changed, 50 insertions(+), 13 deletions(-) diff

[PATCH v2 47/48] remote-hg: add support for --dry-run

This needs a specific patch from Git not applied yet. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 29 +-- contrib/remote-helpers/test-hg.sh| 38 2 files changed, 65 insertions(+), 2 deletions(-) diff

[PATCH v2 45/48] remote-hg: trivial cleanup

It's better to catch the exception later on. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 1e61f43..b08f90

[PATCH v2 46/48] remote-hg: check if a fetch is needed

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 39 contrib/remote-helpers/test-hg.sh| 71 +++- 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remot

[PATCH v2 44/48] remote-helpers: improve marks usage

Always convert to strings (they are unicode because they come from JSON). Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 5 - contrib/remote-helpers/git-remote-hg | 7 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/

[PATCH v2 42/48] remote-hg: add setup_big_push() helper

So we don't duplicate these commands. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 84df1c3..f594584 100755 --

[PATCH v2 43/48] remote-hg: add check_push() helper

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 66 +-- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index f594584..aeab48a 100755 --- a/contrib/re

[PATCH v2 41/48] remote-hg: remove files before modifications

Otherwise replacing a file with a directory doesn't work. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index fa76b3f..b

[PATCH v2 40/48] remote-hg: improve lightweight tag author

Use git's committer. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index a1b22f7..fa76b3f 100755 --- a/c

[PATCH v2 37/48] remote-hg: simplify branch_tip()

It simply picks the last head that is not closed, but we have a stored list of open heads. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/rem

[PATCH v2 39/48] remote-hg: use remote 'default' not local one

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 19 +-- contrib/remote-helpers/test-hg.sh| 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 5ad5

[PATCH v2 38/48] remote-hg: improve branch listing

We want to show the remote heads, not the internal ones, which might have garbage. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/

[PATCH v2 36/48] remote-hg: check diverged bookmarks

So that we can report a proper error. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 24 contrib/remote-helpers/test-hg.sh| 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contr

[PATCH v2 35/48] remote-hg: pass around revision refs

So that when a diverge is detected, we know which ref to report an error for. Also, since we are not throwing an exception, return a proper error code. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 34 +- contrib/remote-helpers/test-h

[PATCH v2 34/48] remote-hg: implement custom checkheads()

The version from Mercurial is extremely inefficient and convoluted, this version achieves basically the same, at least for our purposes. No functional changes. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 52 +--- 1 file changed, 49

[PATCH v2 33/48] remote-hg: implement custom push()

The one from mercurial does a ton of things we are not interested in, and we need some special modifications which are impossible otherwise. Most of the code is borrowed from Mercurial, and cleaned up, but should be functionally the same for our purposes, except that multiple heads are not detecte

[PATCH v2 31/48] remote-hg: force remote bookmark push selectively

If we update the 'old' node, we might be updating the remote bookmark even when our 'new' node is not related at all to what the remote has, effectively forcing an update. Let's do that only when forced push is configured. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg

[PATCH v2 32/48] remote-hg: only update necessary revisions

We don't care about the rest, and in fact, we shouldn't try to push everything, as there might be garbage from previous failed pushes. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/rem

[PATCH v2 30/48] remote-hg: reorganize bookmark handling

We don't need to update both internal and remote bookmarks, so let's do one or the other, and move the shared code earlier, so it's simpler. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 50 ++-- 1 file changed, 19 insertions(+), 31 de

[PATCH v2 28/48] remote-hg: add test for big push

With lots branches and bookmarks, non-ff, updated and new. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 113 -- 1 file changed, 107 insertions(+), 6 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpe

[PATCH v2 29/48] remote-hg: add test for failed double push

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 24 1 file changed, 24 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 1855d1a..c4d98b5 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/co

[PATCH v2 27/48] remote-hg: add test for new bookmark special

>From the point of view of Mercurial, this creates a new branch head, and requires a forced push. Ideally, whoever, we would want it to work just like in git; new branches can be pushed without problems. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 15 +++

[PATCH v2 25/48] remote-hg: add test for diverged push

Neither mercurial nor git allows pushing to a remote when it's a non-fast-forward push. We should be able to detect theses errors and report them properly. As opposed to throwing an exception stack-trace. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 23 +++

[PATCH v2 26/48] remote-hg: add test for bookmark diverge

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 29 + 1 file changed, 29 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 252553e..e059bbc 100755 --- a/contrib/remote-helpers/test-hg.sh +++

[PATCH v2 24/48] remote-hg: add test to push new bookmark

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 30 ++ 1 file changed, 30 insertions(+) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index d927495..8b5e191 100755 --- a/contrib/remote-helpers/test-hg.sh ++

[PATCH v2 22/48] remote-hg: update bookmarks when using a remote

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 17 + 1 file changed, 17 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 7c859b8..76438a6 100755 --- a/contrib/remote-helpers/git-remote-hg +++

[PATCH v2 23/48] remote-hg: add remote tests

The logic when working with a local repository is totally different from the one where we work with a remote repository; we need to pull and push from it. All this logic is currently not tested at all, so let's introduce a variable to force the remote behavior. Signed-off-by: Felipe Contreras --

[PATCH v2 21/48] remote-hg: add check_bookmark() test helper

And check in a more proper way. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 943371a..2f2050c 100755 --- a/contrib/remo

[PATCH v2 19/48] remote-hg: add tests for 'master' bookmark

We want to make sure everything works correctly, even if there's a 'master' bookmark in Mercurial. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 68 ++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/contrib/remote-help

[PATCH v2 20/48] remote-bzr: simplify test checks

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-bzr.sh | 17 + 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/contrib/remote-helpers/test-bzr.sh b/contrib/remote-helpers/test-bzr.sh index 0276db0..435b280 100755 --- a/contrib/remote-helpers/test-bz

[PATCH v2 18/48] remote-hg: always point HEAD to master

Mercurial always checks out the 'default' branch, so there's no point in complicating our lives trying to do something fancier, which causes different behavior depending on whether the repository is local or remote. So let's always use 'default' (which we translate to 'master'), unless we are in h

[PATCH v2 16/48] remote-hg: trivial cleanups

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index e0e68ef..ee60dbf 100755 --- a/contrib/remote-helpers/git-r

[PATCH v2 17/48] remote-hg: improve progress calculation

No need to manually keep track of the revision count. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index ee60dbf..

[PATCH v2 15/48] remote-hg: ensure remote rebasing works

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 1 + contrib/remote-helpers/test-hg.sh| 40 2 files changed, 41 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 2e4f7

[PATCH v2 13/48] remote-hg: switch from revisions to SHA-1 noteids

Otherwise we won't know if revisions are replaced. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 42 +++- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/gi

[PATCH v2 14/48] remote-hg: upgrade version 1 marks

As suggested by Jed Brown; there's no need to re-import all the commits. Cc: Jed Brown Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/con

[PATCH v2 12/48] remote-hg: add version checks to the marks

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 07ea104..e2bef7f 100755 --- a/contrib/remote-helpers/gi

[PATCH v2 11/48] remote-hg: improve node traversing

We won't be able to count the unmarked commits, but we are not going to be able to do that anyway when we switch to SHA-1 ids. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/remote-he

[PATCH v2 10/48] remote-hg: shuffle some code

In preparation to shift to SHA-1's. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 30 +- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 750

[PATCH v2 09/48] remote-hg: use a shared repository store

This way we don't have to have duplicated Mercurial objects. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 35 --- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-h

[PATCH v2 07/48] remote-hg: test: simplify previous branch checkout

@{-1} does the same thing. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg-bidi.sh | 3 +-- contrib/remote-helpers/test-hg-hg-git.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/remote-helpers/test-hg-bidi.sh b/contrib/remote-helpers/test-

[PATCH v2 08/48] remote-hg: load all extensions

The user might have then configured differently, plus, all of them will be loaded anyway later on. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/rem

[PATCH v2 06/48] remote-helpers: test: simplify remote URLs

No need to specify $PWD any more. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-bzr.sh | 12 ++-- contrib/remote-helpers/test-hg-bidi.sh | 6 +++--- contrib/remote-helpers/test-hg-hg-git.sh | 6 +++--- contrib/remote-helpers/test-hg.sh| 14 +++-

[PATCH v2 05/48] remote-helpers: tests: general improvements

So that we don't need a temporary directory. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-bzr.sh | 21 ++-- contrib/remote-helpers/test-hg-bidi.sh | 15 +-- contrib/remote-helpers/test-hg-hg-git.sh | 33 +++- cont

[PATCH v2 04/48] remote-helpers: test: cleanup style

So it's more standardized between all the tests. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-bzr.sh | 88 +- contrib/remote-helpers/test-hg.sh | 12 -- 2 files changed, 66 insertions(+), 34 deletions(-) diff --git a/contrib/remote-hel

[PATCH v2 02/48] remote-hg: trivial reorganization

We only need to get the remote dict once. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 1dd3d70..426c1fc 100755 --

[PATCH v2 03/48] remote-helpers: test: cleanup white-spaces

We prefer tabs to spaces. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-bzr.sh | 460 ++--- contrib/remote-helpers/test-hg.sh | 176 +++--- 2 files changed, 318 insertions(+), 318 deletions(-) diff --git a/contrib/remote-helpers/test-bz

[PATCH v2 01/48] remote-hg: test: be a little more quiet

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/test-hg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh index 8de2aa7..f8d1f9e 100755 --- a/contrib/remote-helpers/test-hg.sh +++ b/contrib/

[PATCH v2 00/48] remote-hg: fixes for next

Hi, Since v1 there's a few backward compatibility fixes, and new patches at the end for new feature, some which require patches to the remote helper infraestructure. I've been cooking these for some time now, and they seem to be mostly ready. The major changes are: 1) Use our own custom push()

[PATCH v2 8/8] remote-bzr: add fallback check for a partial clone

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 3248586..3cd6572 100755 --- a/contrib/remote-helpers/git-remote-bz

[PATCH v2 7/8] remote-bzr: reorganize the way 'wanted' works

If the user specified a list of branches, we ignore what the remote repository lists, and simply use the branches directly. Since some remotes don't report the branches correctly, this is useful. Otherwise either fetch the repo, or the branch. Signed-off-by: Felipe Contreras --- contrib/remote-

[PATCH v2 5/8] remote-bzr: change global repo

It's not used anyway. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 202a4f7..80ed59f 100755 --- a/contrib/remot

[PATCH v2 6/8] remote-bzr: trivial cleanups

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 80ed59f..34025c3 100755 --- a/contrib/remote-helpers/gi

[PATCH v2 4/8] remote-bzr: delay cloning/pulling

Until the branch is actually going to be used. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 28 +--- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-b

[PATCH v2 2/8] remote-bzr: fix for files with spaces

Set the maximum number of splits to make when dividing the diff stat lines based on space characters. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/rem

[PATCH v2 3/8] remote-bzr: simplify get_remote_branch()

No need for 'origin', it's only needed for the bzrdir 'sprout' method, which can be greatly simplified. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/contrib/remote-helpers/g

[PATCH v2 0/8] remote-bzr: patches for next

Hi, Minor fixes since last time. These patches have been cooking in my github repository, and improve the situation when bzr servers don't support repositories properly. Felipe Contreras (8): remote-bzr: recover from failed clones remote-bzr: fix for files with spaces remote-bzr: simplify

[PATCH v2 1/8] remote-bzr: recover from failed clones

Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-bzr | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 10300c6..8a4df51 100755 --- a/contrib/remote-helpe

Re: [PATCH 1/3] for-each-ref: introduce %C(...) for color

On Fri, May 24, 2013 at 7:19 AM, Ramkumar Ramachandra wrote: > Since 'git branch' misses important options like --sort, --count, and > --format that are present in 'git for-each-ref'. Until we are in a > position to fix 'git branch', let us enhance the 'git for-each-ref' > format so it can atleas

Re: [PATCH v2 0/3] Towards a useable git-branch

On Fri, May 24, 2013 at 9:19 PM, Ramkumar Ramachandra wrote: > So, while investigating alignment operators in pretty-formats, I found > out that it's way too much effort and totally not worth it (atleast > not immediately; we can add it later if we want). I just had an idea that might bring prett

What's cooking in git.git (May 2013, #07; Fri, 24)

What's cooking in git.git (May 2013, #07; Fri, 24) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. There are topics that are still in 'next'

[ANNOUNCE] Git v1.8.3

The latest feature release Git v1.8.3 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: bfb88c182daeed5601ba860d785ac813433f55f1 git-1.8.3.tar.gz 92cc8ae5f4c1db2e7751ad0dc9c3227ca31080aa

Re: [PATCH 1/3] for-each-ref: introduce %C(...) for color

On Fri, May 24, 2013 at 4:19 PM, Ramkumar Ramachandra wrote: > @@ -928,12 +936,22 @@ static void emit(const char *cp, const char *ep) > static void show_ref(struct refinfo *info, const char *format, int > quote_style) > { > const char *cp, *sp, *ep; > + char color[COLOR_MAXLEN]; >

Re: first parent, commit graph layout, and pull merge direction

From: "Junio C Hamano" Sent: Friday, May 24, 2013 5:26 PM Felipe Contreras writes: ... but I don't see why something small like that wouldn't make sense: The pull was not fast-forward, please either merge or rebase. OK, I think I got what John was getting at and this single liner message i

Re: [PATCH 2/3] for-each-ref: introduce %(HEAD) marker

From: "Ramkumar Ramachandra" Sent: Friday, May 24, 2013 3:19 PM 'git branch' shows which branch you are currently on with an '*', but 'git for-each-ref' misses this feature. So, extend the format with %(HEAD) to do exactly the same thing. Maybe 'isHEAD' as a better name, or 'ifHEAD', or some

Re: first parent, commit graph layout, and pull merge direction

Andreas Krey writes: > On Thu, 23 May 2013 09:01:15 +, Junio C Hamano wrote: > ... >> Instead of having a nice "these six commits marked as 'x' were done >> on a branch forked some time ago, to address only this one issue and >> to address it fully" history that explains how these commits wer

Re: [PATCH 7/7] sha1_name: implement finding @{push}

Ramkumar Ramachandra writes: > Junio C Hamano wrote: rev-parse (with an option, maybe) may be a better place for this. >>> >>> Er, no. I actually want things like diff @{p}..HEAD. I want it to be >>> a first-class revision, just like @{u}. >> >> I think Duy's suggestion makes perfect

RE: [QUERY] How do you sort completions?

> -Original Message- > From: git-ow...@vger.kernel.org > [mailto:git-ow...@vger.kernel.org] On Behalf Of Ramkumar Ramachandra > Sent: Friday, May 24, 2013 12:19 PM > To: SZEDER Gábor > Cc: Git List; Felipe Contreras > Subject: Re: [QUERY] How do you sort completions? > > SZEDER Gábor wro

Re: [QUERY] How do you sort completions?

Antoine Pelisse wrote: > I think sorting is required for faster look-up, most likely with > dichotomic search. Otherwise it would have to search the whole list > each time. Oh, it's probably keeping just one copy of the completions in memory (which has to be sorted for search); this is also used t

Re: [PATCH 7/7] sha1_name: implement finding @{push}

Junio C Hamano wrote: >>> rev-parse (with an option, maybe) may be a better place for >>> this. >> >> Er, no. I actually want things like diff @{p}..HEAD. I want it to be >> a first-class revision, just like @{u}. > > I think Duy's suggestion makes perfect sense; rev-parse already has > a mechani

  1   2   >