Hi Eric,
I last sent these patches as an RFC a year and a half or so ago[1].
Nathan seemed to like them and they still seem valid, so thought
I'd resubmit. :)
Thoughts of all kinds welcome, as always.
Jonathan Nieder (1):
git-svn: clarify explanation of --destination argument
Nathan Gray
From: Nathan Gray n8g...@n8gray.org
Date: Mon, 19 Dec 2011 19:23:50 -0600
git svn can be configured to use multiple fetch, branches, and tags
refspecs by passing multiple --branches or --tags options at init time
or editing the configuration file later, which can be handy when
working with messy
Date: Mon, 19 Dec 2011 19:24:30 -0600
The existing documentation for -d does not make it obvious whether
its argument is supposed to be a full svn path, a partial svn path,
the glob from the config file, or what. Clarify the text and add an
example to get the reader started.
Reported-by: Nathan
Ramkumar Ramachandra wrote:
I still don't know exactly what -G and -S do.
If you've been following recent gitk development (or this thread)
closely, you'll know that git log -S finds commits adding/removing a
string, while git log -G finds commits changing lines matching a
regex.
Examples for
Martin Langhoff martin.langh...@gmail.com writes:
On Mon, May 13, 2013 at 3:33 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Well, no, it should find the final change that brought it into the
current form. Just like git blame.
Has it been finding zero results in some cases where the current
Thomas Rast tr...@inf.ethz.ch writes:
Below is the coverage-untested-functions output; it seems submodule.c
is covered, so there is nothing for Jens to do ;-)
Nice.
Here are some hints to add coverages to the selected functions.
alloc.c: report
alloc.c: alloc_report
I believe these are
Am 13.05.2013 23:27, schrieb Thomas Rast:
Jens asked me at git-merge if coverage support was still available.
Turns out it is, but there were some weirdnesses. So this should fix
them. It is relly slow as you still have to run the tests one by
one; despite claims in the wild that it is
Ramkumar Ramachandra wrote:
I've
never really found the outputs from earlier tests enlightening.
If the test suite would automatically use set -x when appropriate
so output for each command was preceded by the command being run,
that
Hi,
Since the last series is not merged to master yet, I decided to add more
cleanups.
Felipe Contreras (10):
remote-hg: trivial cleanups
remote-hg: get rid of unused exception checks
remote-hg: enable track-branches in hg-git mode
remote-hg: add new get_config_bool() helper
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 2 +-
contrib/remote-helpers/test-hg-hg-git.sh | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
We are not calling check_output() anymore.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 24 +---
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
The user can turn this off.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 1 -
contrib/remote-helpers/test-hg-hg-git.sh | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
When force_push is disabled, we need to turn the argument to True.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
In certain situations we might end up pushing garbage revisions (e.g. in
a rebase), and the patches to deal with that haven't been merged yet.
So let's disable forced pushes by default.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 2 +-
1
We skip it locally, but not for the remote, so let's do so.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index beb864b..dc276af 100755
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
---
We only need to get the remote dict once.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
On Fri, May 10, 2013 at 3:59 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
A few fixes since last series, plus a few more patches. Simple no-brainers.
Felipe Contreras (6):
remote-hg: disable forced push by default
remote-hg: don't push fake 'master' bookmark
remote-hg:
On Fri, Apr 26, 2013 at 10:01 PM, Ramkumar Ramachandra
artag...@gmail.com wrote:
Felipe Contreras wrote:
That's fine, I was mostly asking Ramkumar who earlier argued earlier
versions of this patch were not understandable.
Sorry, still catching up with list emails. At a glance, part 1 looks
On Mon, May 13, 2013 at 04:04:35PM +0200, Heiko Voigt wrote:
-static int do_config_from(struct config_file *top, config_fn_t fn, void
*data)
+static int do_config_from_source(struct config_source *top, config_fn_t
fn, void *data)
[...]
I thought I recalled that Jeff asked me to
On Mon, May 13, 2013 at 8:08 PM, Junio C Hamano gits...@pobox.com wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Since the last series is not merged to master yet, I decided to add more
cleanups.
Because nothing new will go to 'master' past -rc1 by default, unless
you are
If a clone exists with the old organization (v1.8.2) it will prevent the
new shared repository organization from working, so let's remove this
repository, which is not used any more.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-bzr | 7 +++
Hi,
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() method that allows us to push bookmarks without
having to force a push.
2) Switch from revision numbers to SHA-1s in the marks.
3) Use a common repsitory
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 2 +-
contrib/remote-helpers/test-hg-hg-git.sh | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
We are not calling check_output() anymore.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 24 +---
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
The user can turn this off.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 1 -
contrib/remote-helpers/test-hg-hg-git.sh | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
No functional changes.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
When force_push is disabled, we need to turn the argument to True.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
In certain situations we might end up pushing garbage revisions (e.g. in
a rebase), and the patches to deal with that haven't been merged yet.
So let's disable forced pushes by default.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 2 +-
1
We skip it locally, but not for the remote, so let's do so.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/contrib/remote-helpers/git-remote-hg
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index beb864b..dc276af 100755
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
---
We only need to get the remote dict once.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
We prefer tabs to spaces.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/test-bzr.sh | 460 ++---
contrib/remote-helpers/test-hg.sh | 176 +++---
2 files changed, 318 insertions(+), 318 deletions(-)
diff --git
So it's more standardized between all the tests.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/test-bzr.sh | 88 +-
contrib/remote-helpers/test-hg.sh | 12 --
2 files changed, 66 insertions(+), 34 deletions(-)
diff
So that we don't need a temporary directory.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/test-bzr.sh | 21 ++--
contrib/remote-helpers/test-hg-bidi.sh | 15 +--
contrib/remote-helpers/test-hg-hg-git.sh | 33
No need to specify $PWD any more.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/test-bzr.sh | 12 ++--
contrib/remote-helpers/test-hg-bidi.sh | 6 +++---
contrib/remote-helpers/test-hg-hg-git.sh | 6 +++---
@{-1} does the same thing.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
This way we don't have to have duplicated Mercurial objects.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 35 ---
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git
In preparation to shift to SHA-1's.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 30 +-
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
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 felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
Otherwise we won't know if revisions are replaced.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 42 +++-
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
As suggested by Jed Brown; there's no need to re-import all the commits.
Cc: Jed Brown j...@59a2.org
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 22 ++
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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 bc6e8fa..49af8d5 100755
---
No need to manually keep track of the revision count.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
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
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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 90f8c7f..220e388 100755
---
And check in a more proper way.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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 44764a0..5e4f53f 100755
---
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 felipe.contre...@gmail.com
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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 06700a8..f4e3807 100755
---
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 felipe.contre...@gmail.com
---
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 felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 52 +++-
1 file
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 felipe.contre...@gmail.com
---
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 felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 9 +++--
1 file changed, 7 insertions(+), 2
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.
Signed-off-by: Felipe Contreras
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 felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 37
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 felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 34 +-
So that we can report a proper error.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 24
contrib/remote-helpers/test-hg.sh| 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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 d98c7a7..9d62e26 100755
---
It simply picks the last head that is not closed, but we have a stored
list of open heads.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git
We want to show the remote heads, not the internal ones, which might
have garbage.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
Use git's committer.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
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
Otherwise replacing a file with a directory doesn't work.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
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
The user might have then configured differently, plus, all of them will
be loaded anyway later on.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/remote-helpers/git-remote-hg | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
On Mon, May 13, 2013 at 8:08 PM, Junio C Hamano gits...@pobox.com wrote:
Folks interested in working remote-hg, please try it out, so that we
can have a polished one soon after 1.8.3 ships (I am not saying this
round is not polished---I haven't even looked at the patches).
And others, please
101 - 171 of 171 matches
Mail list logo
