* [PATCH 1/2] send-email: refactor and ensure prompting doesn't loop forever
From: Jay Soffian @ 2009-03-29 1:39 UTC (permalink / raw)
To: git; +Cc: Jay Soffian, Matthieu Moy, Junio C Hamano
Several places in send-email prompt for input, and will do so forever
when the input is EOF. This is poor behavior when send-email is run
unattended (say from cron).
This patch refactors the prompting to an ask() function which takes a
prompt, an optional default, and an optional regex to validate the
input. The function returns on EOF, or if a default is provided and the
user simply types return, or if the input passes the validating regex
(which accepts all input by default). The ask() function gives up after
10 tries in case of invalid input.
There are three callers of the function:
1) "Who should the emails appear to be from?" which provides a default
sender. Previously the user would have to type ctrl-d to accept the
default. Now the user can just hit return, or type ctrl-d.
2) "Who should the emails be sent to?". Previously this prompt passed a
second argument ("") to $term->readline() which was ignored. I believe
the intent was to allow the user to just hit return. Now the user
can do so, or type ctrl-d.
3) "Send this email?". Previously this prompt would loop forever until
it got a valid reply. Now it stops prompting on EOF or a valid reply. In
the case where confirm = "inform", it now defaults to "y" on EOF or the
user hitting return, otherwise an invalid reply causes send-email to
terminate.
A followup patch adds tests for the new functionality.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
git-send-email.perl | 66 ++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 32 deletions(-)
This and the next patch address the bug reported by Matthieu in
http://article.gmane.org/gmane.comp.version-control.git/114577
Of course, I've been wanting to refactor the prompting for a while, so I used
the bug fix as an excuse to do so.
j.
diff --git a/git-send-email.perl b/git-send-email.perl
index 546d2eb..f0405c8 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -606,32 +606,40 @@ EOT
do_edit(@files);
}
+sub ask {
+ my ($prompt, %arg) = @_;
+ my $valid_re =$arg{valid_re} || ""; # "" matches anything
+ my $default = $arg{default};
+ my $resp;
+ my $i = 0;
+ while ($i++ < 10) {
+ $resp = $term->readline($prompt);
+ if (!defined $resp) { # EOF
+ print "\n";
+ return defined $default ? $default : undef;
+ }
+ if ($resp eq '' and defined $default) {
+ return $default;
+ }
+ if ($resp =~ /$valid_re/) {
+ return $resp;
+ }
+ }
+ return undef;
+}
+
my $prompting = 0;
if (!defined $sender) {
$sender = $repoauthor || $repocommitter || '';
-
- while (1) {
- $_ = $term->readline("Who should the emails appear to be from? [$sender] ");
- last if defined $_;
- print "\n";
- }
-
- $sender = $_ if ($_);
+ $sender = ask("Who should the emails appear to be from? [$sender] ",
+ default => $sender);
print "Emails will be sent from: ", $sender, "\n";
$prompting++;
}
if (!@to) {
-
-
- while (1) {
- $_ = $term->readline("Who should the emails be sent to? ", "");
- last if defined $_;
- print "\n";
- }
-
- my $to = $_;
- push @to, parse_address_line($to);
+ my $to = ask("Who should the emails be sent to? ");
+ push @to, parse_address_line($to) if defined $to; # sanitized/validated later
$prompting++;
}
@@ -651,13 +659,8 @@ sub expand_aliases {
@bcclist = expand_aliases(@bcclist);
if ($thread && !defined $initial_reply_to && $prompting) {
- while (1) {
- $_= $term->readline("Message-ID to be used as In-Reply-To for the first email? ", $initial_reply_to);
- last if defined $_;
- print "\n";
- }
-
- $initial_reply_to = $_;
+ $initial_reply_to = ask(
+ "Message-ID to be used as In-Reply-To for the first email? ");
}
if (defined $initial_reply_to) {
$initial_reply_to =~ s/^\s*<?//;
@@ -839,8 +842,10 @@ X-Mailer: git-send-email $gitversion
if ($needs_confirm && !$dry_run) {
print "\n$header\n";
+ my $ask_default;
if ($needs_confirm eq "inform") {
$confirm_unconfigured = 0; # squelch this message for the rest of this run
+ $ask_default = "y"; # assume yes on EOF since user hasn't explicitly asked for confirmation
print " The Cc list above has been expanded by additional\n";
print " addresses found in the patch commit message. By default\n";
print " send-email prompts before sending whenever this occurs.\n";
@@ -851,13 +856,10 @@ X-Mailer: git-send-email $gitversion
print " To retain the current behavior, but squelch this message,\n";
print " run 'git config --global sendemail.confirm auto'.\n\n";
}
- while (1) {
- chomp ($_ = $term->readline(
- "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
- ));
- last if /^(?:yes|y|no|n|quit|q|all|a)/i;
- print "\n";
- }
+ $_ = ask("Send this email? ([y]es|[n]o|[q]uit|[a]ll): ",
+ valid_re => qr/^(?:yes|y|no|n|quit|q|all|a)/i,
+ default => $ask_default);
+ die "Send this email reply required" unless defined $_;
if (/^n/i) {
return;
} elsif (/^q/i) {
--
1.6.2.313.g33352
^ permalink raw reply related
* [PATCH 2/2] send-email: add tests for refactored prompting
From: Jay Soffian @ 2009-03-29 1:39 UTC (permalink / raw)
To: git; +Cc: Jay Soffian, Matthieu Moy, Junio C Hamano
In-Reply-To: <1238290751-57461-1-git-send-email-jaysoffian@gmail.com>
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
t/t9001-send-email.sh | 52 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index e426c96..b4de98c 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -421,8 +421,8 @@ test_confirm () {
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
- $@ \
- $patches | grep "Send this email"
+ $@ $patches > stdout &&
+ grep "Send this email" stdout
}
test_expect_success '--confirm=always' '
@@ -444,8 +444,10 @@ test_expect_success '--confirm=compose' '
test_expect_success 'confirm by default (due to cc)' '
CONFIRM=$(git config --get sendemail.confirm) &&
git config --unset sendemail.confirm &&
- test_confirm &&
- git config sendemail.confirm $CONFIRM
+ test_confirm
+ ret="$?"
+ git config sendemail.confirm ${CONFIRM:-never}
+ test $ret = "0"
'
test_expect_success 'confirm by default (due to --compose)' '
@@ -457,6 +459,48 @@ test_expect_success 'confirm by default (due to --compose)' '
test $ret = "0"
'
+test_expect_success 'confirm detects EOF (inform assumes y)' '
+ CONFIRM=$(git config --get sendemail.confirm) &&
+ git config --unset sendemail.confirm &&
+ GIT_SEND_EMAIL_NOTTY=1 \
+ git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ $patches < /dev/null
+ ret="$?"
+ git config sendemail.confirm ${CONFIRM:-never}
+ test $ret = "0"
+'
+
+test_expect_success 'confirm detects EOF (auto causes failure)' '
+ CONFIRM=$(git config --get sendemail.confirm) &&
+ git config sendemail.confirm auto &&
+ GIT_SEND_EMAIL_NOTTY=1 \
+ test_must_fail git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ $patches < /dev/null
+ ret="$?"
+ git config sendemail.confirm ${CONFIRM:-never}
+ test $ret = "0"
+'
+
+test_expect_success 'confirm doesnt loop forever' '
+ CONFIRM=$(git config --get sendemail.confirm) &&
+ git config sendemail.confirm auto &&
+ yes "bogus" | GIT_SEND_EMAIL_NOTTY=1 \
+ test_must_fail git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ $patches
+ ret="$?"
+ git config sendemail.confirm ${CONFIRM:-never}
+ test $ret = "0"
+'
+
test_expect_success '--compose adds MIME for utf8 body' '
clean_fake_sendmail &&
(echo "#!$SHELL_PATH" &&
--
1.6.2.313.g33352
^ permalink raw reply related
* Re: [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}
From: Jay Soffian @ 2009-03-29 1:38 UTC (permalink / raw)
To: Santi Béjar; +Cc: git
In-Reply-To: <1238281804-30290-2-git-send-email-santi@agolina.net>
On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@agolina.net> wrote:
> branch.<name>.merge::
> + It defines, together with branch.<name>.remote, the tracking branch
> + for the current branch. It tells 'git-fetch'/'git-pull' which
> + branch to merge.
I think it would be clearer to say "the upstream branch for the
current branch", since
it could very well be a local branch, not necessarily a remote tracking branch.
j.
^ permalink raw reply
* Getting GIT+git-daemon+gitweb working properly on Fedora 10
From: Aaron Gray @ 2009-03-28 23:18 UTC (permalink / raw)
To: Git Mailing List
In-Reply-To: <8c9a060903281501t268897d1pe2afa2f82fd2fd3a@mail.gmail.com>
gitweb is showing a repository last changed on the front page 2 days ago but
in the summary is showing a change 3 hours ago.
I am getting different behaviours from different repositories. on gitweb and
in their base directories some have file some donot. The ones with files
have not been checked out and will not commit either.
What I need is a well written set of instructions on how to import both
small and large SVN repositories and how to serve them and how to get gitweb
to reflect actually what is going on.
Thanks,
Aaron
^ permalink raw reply
* [PATCH 4/4] Rename push.default to push.style
From: Santi Béjar @ 2009-03-28 23:10 UTC (permalink / raw)
To: git
In-Reply-To: <1238281804-30290-1-git-send-email-santi@agolina.net>
push.default was too generic, and also didn't specify if it was about
remote, refspec, branches, behaviour...
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/RelNotes-1.6.3.txt | 2 +-
Documentation/config.txt | 4 ++--
builtin-push.c | 16 ++++++++--------
cache.h | 14 +++++++-------
config.c | 10 +++++-----
environment.c | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index f0a2e41..f3533e6 100644
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -24,7 +24,7 @@ receive.denyDeleteCurrent in the receiving repository.
When the user does not tell "git push" what to push, it has always
pushed matching refs. For some people it is unexpected, and a new
-configuration variable push.default has been introduced to allow
+configuration variable push.style has been introduced to allow
changing a different default behaviour. To advertise the new feature,
a big warning is issued if this is not configured and a git push without
arguments is attempted.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cb392fd..f2d675a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
branch.<name>.merge::
It defines, together with branch.<name>.remote, the tracking branch
for the current branch. It tells 'git-fetch'/'git-pull' which
- branch to merge and can also afect 'git-push' (see push.default).
+ branch to merge and can also afect 'git-push' (see push.style).
When in branch <name>, it tells 'git-fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
handled like the remote part of a refspec, and must match a
@@ -1215,7 +1215,7 @@ pull.octopus::
pull.twohead::
The default merge strategy to use when pulling a single branch.
-push.default::
+push.style::
Defines the action git push should take if no refspec is given
on the command line, no refspec is configured in the remote, and
no refspec is implied by any of the options given on the command
diff --git a/builtin-push.c b/builtin-push.c
index 2eabcd3..ba0dd6f 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -72,7 +72,7 @@ static const char *warn_unconfigured_push_msg[] = {
"not necessarily be what you want to happen.",
"",
"You can specify what action you want to take in this case, and",
- "avoid seeing this message again, by configuring 'push.default' to:",
+ "avoid seeing this message again, by configuring 'push.style' to:",
" 'nothing' : Do not push anything",
" 'matching' : Push all matching branches (default)",
" 'tracking' : Push the current branch to whatever it is tracking",
@@ -89,26 +89,26 @@ static void warn_unconfigured_push(void)
static void setup_default_push_refspecs(void)
{
git_config(git_default_config, NULL);
- switch (push_default) {
- case PUSH_DEFAULT_UNSPECIFIED:
+ switch (push_style) {
+ case PUSH_STYLE_UNSPECIFIED:
warn_unconfigured_push();
/* fallthrough */
- case PUSH_DEFAULT_MATCHING:
+ case PUSH_STYLE_MATCHING:
add_refspec(":");
break;
- case PUSH_DEFAULT_TRACKING:
+ case PUSH_STYLE_TRACKING:
setup_push_tracking();
break;
- case PUSH_DEFAULT_CURRENT:
+ case PUSH_STYLE_CURRENT:
add_refspec("HEAD");
break;
- case PUSH_DEFAULT_NOTHING:
+ case PUSH_STYLE_NOTHING:
die("You didn't specify any refspecs to push, and "
- "push.default is \"nothing\".");
+ "push.style is \"nothing\".");
break;
}
}
diff --git a/cache.h b/cache.h
index 641529b..9190046 100644
--- a/cache.h
+++ b/cache.h
@@ -542,17 +542,17 @@ enum rebase_setup_type {
AUTOREBASE_ALWAYS,
};
-enum push_default_type {
- PUSH_DEFAULT_UNSPECIFIED = -1,
- PUSH_DEFAULT_NOTHING = 0,
- PUSH_DEFAULT_MATCHING,
- PUSH_DEFAULT_TRACKING,
- PUSH_DEFAULT_CURRENT,
+enum push_style_type {
+ PUSH_STYLE_UNSPECIFIED = -1,
+ PUSH_STYLE_NOTHING = 0,
+ PUSH_STYLE_MATCHING,
+ PUSH_STYLE_TRACKING,
+ PUSH_STYLE_CURRENT,
};
extern enum branch_track git_branch_track;
extern enum rebase_setup_type autorebase;
-extern enum push_default_type push_default;
+extern enum push_style_type push_style;
#define GIT_REPO_VERSION 0
extern int repository_format_version;
diff --git a/config.c b/config.c
index b76fe4c..86ac830 100644
--- a/config.c
+++ b/config.c
@@ -567,17 +567,17 @@ static int git_default_branch_config(const char *var, const char *value)
static int git_default_push_config(const char *var, const char *value)
{
- if (!strcmp(var, "push.default")) {
+ if (!strcmp(var, "push.style")) {
if (!value)
return config_error_nonbool(var);
else if (!strcmp(value, "nothing"))
- push_default = PUSH_DEFAULT_NOTHING;
+ push_style = PUSH_STYLE_NOTHING;
else if (!strcmp(value, "matching"))
- push_default = PUSH_DEFAULT_MATCHING;
+ push_style = PUSH_STYLE_MATCHING;
else if (!strcmp(value, "tracking"))
- push_default = PUSH_DEFAULT_TRACKING;
+ push_style = PUSH_STYLE_TRACKING;
else if (!strcmp(value, "current"))
- push_default = PUSH_DEFAULT_CURRENT;
+ push_style = PUSH_STYLE_CURRENT;
else {
error("Malformed value for %s: %s", var, value);
return error("Must be one of nothing, matching, "
diff --git a/environment.c b/environment.c
index 4696885..8d2450c 100644
--- a/environment.c
+++ b/environment.c
@@ -42,7 +42,7 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
-enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
+enum push_style_type push_style = PUSH_STYLE_UNSPECIFIED;
/* Parallel index stat data preload? */
int core_preload_index = 0;
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCH 3/4] Documentation: branch.*.merge can also afect 'git-push'
From: Santi Béjar @ 2009-03-28 23:10 UTC (permalink / raw)
To: git
In-Reply-To: <1238281804-30290-1-git-send-email-santi@agolina.net>
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/config.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 07f88f5..cb392fd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
branch.<name>.merge::
It defines, together with branch.<name>.remote, the tracking branch
for the current branch. It tells 'git-fetch'/'git-pull' which
- branch to merge.
+ branch to merge and can also afect 'git-push' (see push.default).
When in branch <name>, it tells 'git-fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
handled like the remote part of a refspec, and must match a
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCH 2/4] Documentation: push.default applies to all remotes
From: Santi Béjar @ 2009-03-28 23:10 UTC (permalink / raw)
To: git
In-Reply-To: <1238281804-30290-1-git-send-email-santi@agolina.net>
push.default is not only for the current remote but setting the default
behaviour for all remotes.
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/config.txt | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 56f0cd7..07f88f5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1219,19 +1219,14 @@ push.default::
Defines the action git push should take if no refspec is given
on the command line, no refspec is configured in the remote, and
no refspec is implied by any of the options given on the command
- line.
-+
-The term `current remote` means the remote configured for the current
-branch, or `origin` if no remote is configured. `origin` is also used
-if you are not on any branch. Possible values are:
+ line. Possible values are:
+
* `nothing` do not push anything.
-* `matching` push all matching branches to the current remote.
+* `matching` push all matching branches.
All branches having the same name in both ends are considered to be
matching. This is the current default value.
* `tracking` push the current branch to the branch it is tracking.
-* `current` push the current branch to a branch of the same name on the
- current remote.
+* `current` push the current branch to a branch of the same name.
rebase.stat::
Whether to show a diffstat of what changed upstream since the last
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}
From: Santi Béjar @ 2009-03-28 23:10 UTC (permalink / raw)
To: git
In-Reply-To: <1238281804-30290-1-git-send-email-santi@agolina.net>
The documentation for branch.*.merge is very dense, so add a simple
explanation on top of it.
And branch.*.remote also afects 'git push'. Text taken from
'push.default'.
Signed-off-by: Santi Béjar <santi@agolina.net>
---
Documentation/config.txt | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 089569a..56f0cd7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -473,10 +473,14 @@ branch.autosetuprebase::
This option defaults to never.
branch.<name>.remote::
- When in branch <name>, it tells 'git-fetch' which remote to fetch.
- If this option is not given, 'git-fetch' defaults to remote "origin".
+ When in branch <name>, it tells 'git-fetch' and 'git-push' which
+ remote to fetch/push, and defaults to `origin` if no remote is
+ configured. `origin` is also used if you are not on any branch.
branch.<name>.merge::
+ It defines, together with branch.<name>.remote, the tracking branch
+ for the current branch. It tells 'git-fetch'/'git-pull' which
+ branch to merge.
When in branch <name>, it tells 'git-fetch' the default
refspec to be marked for merging in FETCH_HEAD. The value is
handled like the remote part of a refspec, and must match a
--
1.6.1.258.g7ff14
^ permalink raw reply related
* [PATCH 0/4] push.default and branch.<name>.{remote,merge} changes
From: Santi Béjar @ 2009-03-28 23:10 UTC (permalink / raw)
To: git
Hi *,
the four patches are independent, but I've send them in a series because
their topic is related. Well, there is a textual dependency between the 3rd
and the 4th.
The 1st one can also be applied to 'maint' while the rest is on top of 'next'
because the 'push.default' is only there.
Santi Béjar (4):
Documentation: enhance branch.<name>.{remote,merge}
Documentation: push.default applies to all remotes
Documentation: branch.*.merge can also afect 'git-push'
Rename push.default to push.style
Documentation/RelNotes-1.6.3.txt | 2 +-
Documentation/config.txt | 21 ++++++++++-----------
builtin-push.c | 16 ++++++++--------
cache.h | 14 +++++++-------
config.c | 10 +++++-----
environment.c | 2 +-
6 files changed, 32 insertions(+), 33 deletions(-)
^ permalink raw reply
* Re: [EGIT] How to deal with important modifications
From: Ferry Huberts (Pelagic) @ 2009-03-28 22:44 UTC (permalink / raw)
Cc: Robin Rosenberg, Shawn O. Pearce, git
In-Reply-To: <1238261528.6971.10.camel@localhost>
Yann Simon wrote:
> Hi,
>
> I am working on the synchronization view. It is not 100% functional yet.
> The view is not updated when a local file is modified for example.
> As the modifications are getting important, I was wondering how to deal
> with it. Should I continue my work an send all the patches when
> finished?
>
> To have an overview of the modifications:
> http://github.com/yanns/egit/commit/18c4a928d53345802a8c9641dcb2d457ebbe2cbc
> http://github.com/yanns/egit/commit/9fab398fa1b7b6efa9532b3c09e5bcfcc8bb9419
>
> Or should I begin to send patches, but by not activating the function
> yet?
> (It could be a way to have other people to help contributing.)
>
> Yann
Yann,
I was asking myself the same questions about my work on ignores and
chose to send it out early, being half completed. Don't know if that was
right, did not receive feedback yet, but it's only been 2 days with
Eclipsecon wrapping up on friday.
If you keep a seperate changeset in which you activate your work and
split up the changesets in manageable pieces it's easier for others to
review your work and comment on it.
Love to see your work though. Having the sync view available for git
would be a major plus. I proposed something simpler on the wiki: a
'pending changes' window. But if you have the complete sync view that's
wonderful.
my 2 cents :-)
Ferry
^ permalink raw reply
* [PATCH] Add diffuse as merge and diff tool
From: Sebastian Pipping @ 2009-03-28 22:25 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: git-diffuse-mergetool.patch --]
[-- Type: text/x-patch, Size: 7020 bytes --]
>From e54c153a67cef9b162eb51f4b7cefb65e59c3a13 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 26 Mar 2009 20:42:31 +0100
Subject: [PATCH] Add diffuse as merge and diff tool
---
Documentation/git-mergetool.txt | 3 ++-
Documentation/merge-config.txt | 7 ++++---
contrib/completion/git-completion.bash | 3 ++-
contrib/difftool/git-difftool-helper | 12 ++++++++----
contrib/difftool/git-difftool.txt | 4 ++--
git-gui/lib/mergetool.tcl | 7 +++++++
git-mergetool.sh | 15 ++++++++++++---
7 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 5d3c632..c3a8092 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -26,7 +26,8 @@ OPTIONS
--tool=<tool>::
Use the merge resolution program specified by <tool>.
Valid merge tools are:
- kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff
+ kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
+ diffuse and opendiff
+
If a merge resolution program is not specified, 'git-mergetool'
will use the configuration variable `merge.tool`. If the
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 1ff08ff..ef07cf2 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -22,9 +22,10 @@ merge.stat::
merge.tool::
Controls which merge resolution program is used by
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
- "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
- "opendiff". Any other value is treated is custom merge tool
- and there must be a corresponding mergetool.<tool>.cmd option.
+ "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
+ "diffuse" and "opendiff". Any other value is treated is custom
+ merge tool and there must be a corresponding mergetool.<tool>.cmd
+ option.
merge.verbosity::
Controls the amount of output shown by the recursive merge
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1c6b0e2..2e7a9d7 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1173,7 +1173,8 @@ _git_mergetool ()
--tool=*)
__gitcomp "
kdiff3 tkdiff meld xxdiff emerge
- vimdiff gvimdiff ecmerge opendiff
+ vimdiff gvimdiff ecmerge diffuse
+ opendiff
" "" "${cur##--tool=}"
return
;;
diff --git a/contrib/difftool/git-difftool-helper b/contrib/difftool/git-difftool-helper
index 9c0a134..ea44e4e 100755
--- a/contrib/difftool/git-difftool-helper
+++ b/contrib/difftool/git-difftool-helper
@@ -1,6 +1,6 @@
#!/bin/sh
# git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
-# It supports kdiff3, kompare, tkdiff, xxdiff, meld, opendiff,
+# It supports kdiff3, kompare, tkdiff, xxdiff, meld, diffuse, opendiff,
# emerge, ecmerge, vimdiff, gvimdiff, and custom user-configurable tools.
# This script is typically launched by using the 'git difftool'
# convenience command.
@@ -103,6 +103,10 @@ launch_merge_tool () {
"$LOCAL" "$REMOTE"
;;
+ diffuse)
+ "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+ ;;
+
opendiff)
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-merge "$MERGED" | cat
@@ -140,7 +144,7 @@ valid_custom_tool() {
# Built-in merge tools are always valid.
valid_tool() {
case "$1" in
- kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
+ kdiff3 | kompare | tkdiff | xxdiff | meld | diffuse | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
;; # happy
*)
if ! valid_custom_tool "$1"
@@ -194,9 +198,9 @@ if test -z "$merge_tool"; then
if test -n "$DISPLAY"; then
# If gnome then prefer meld, otherwise, prefer kdiff3 or kompare
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
- merge_tool_candidates="meld kdiff3 kompare tkdiff xxdiff gvimdiff"
+ merge_tool_candidates="meld kdiff3 kompare tkdiff xxdiff gvimdiff diffuse"
else
- merge_tool_candidates="kdiff3 kompare tkdiff xxdiff meld gvimdiff"
+ merge_tool_candidates="kdiff3 kompare tkdiff xxdiff meld gvimdiff diffuse"
fi
fi
if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt
index 2b7bc03..6419d37 100644
--- a/contrib/difftool/git-difftool.txt
+++ b/contrib/difftool/git-difftool.txt
@@ -28,8 +28,8 @@ OPTIONS
--tool=<tool>::
Use the merge resolution program specified by <tool>.
Valid merge tools are:
- kdiff3, kompare, tkdiff, meld, xxdiff, emerge,
- vimdiff, gvimdiff, ecmerge, and opendiff
+ kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
+ ecmerge, diffuse and opendiff
+
If a merge resolution program is not specified, 'git-difftool'
will use the configuration variable `diff.tool`. If the
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index eb2b4b5..658c021 100644
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
@@ -219,6 +219,13 @@ proc merge_resolve_tool2 {} {
set cmdline [list "$merge_tool_path" "$LOCAL" "$REMOTE" -merge "$MERGED"]
}
}
+ diffuse {
+ if {$base_stage ne {}} {
+ set cmdline [list "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" "$BASE" ]
+ } else {
+ set cmdline [list "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" ]
+ }
+ }
ecmerge {
if {$base_stage ne {}} {
set cmdline [list "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" --default --mode=merge3 --to="$MERGED"]
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 87fa88a..2c96da1 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -239,6 +239,15 @@ merge_file () {
fi
check_unchanged
;;
+ diffuse)
+ touch "$BACKUP"
+ if base_present; then
+ "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" "$BASE" | cat
+ else
+ "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" | cat
+ fi
+ check_unchanged
+ ;;
opendiff)
touch "$BACKUP"
if base_present; then
@@ -345,7 +354,7 @@ valid_custom_tool()
valid_tool() {
case "$1" in
- kdiff3 | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
+ kdiff3 | tkdiff | xxdiff | meld | diffuse | opendiff | emerge | vimdiff | gvimdiff | ecmerge)
;; # happy
*)
if ! valid_custom_tool "$1"; then
@@ -398,9 +407,9 @@ fi
if test -z "$merge_tool" ; then
if test -n "$DISPLAY"; then
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
- merge_tool_candidates="meld kdiff3 tkdiff xxdiff gvimdiff"
+ merge_tool_candidates="meld kdiff3 tkdiff xxdiff gvimdiff diffuse"
else
- merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
+ merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff diffuse"
fi
fi
if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
--
1.6.2.1-2808-gb0085a7
^ permalink raw reply related
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: Sverre Rabbelier @ 2009-03-28 22:21 UTC (permalink / raw)
To: jamespetts; +Cc: git
In-Reply-To: <1238278694146-2550633.post@n2.nabble.com>
Heya,
On Sat, Mar 28, 2009 at 23:18, jamespetts <jamespetts@yahoo.com> wrote:
> git: 'svn' is not a git-command. See 'git --help'.
Try updating to the latest snapshot, git shipped without svn on
windows for a few releases.
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: jamespetts @ 2009-03-28 22:18 UTC (permalink / raw)
To: git
In-Reply-To: <8c9a060903281504qd1b66hefb70e60c3f624d2@mail.gmail.com>
Thank you for replying again so soon :-)
I tried using the exact command that you gave me earlier, but got the identical error:
git: 'svn' is not a git-command. See 'git --help'.
On Sat, Mar 28, 2009 at 14:46, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you for your reply. Unfortunately, I cannot for the life of me get git-svn to work. It refuses to recognise "git svn" as a valid command, and "svn" does not appear in the list of commands when I type, "svn --help" in Git Bash (I am using Git in Windows, if that makes any difference). I tried to look for svn2git, but the homepage linked from the link that you gave me produced a 404.
>
> Also, once I have managed to create a Git clone of the SVN repository myself, how do I synchronise that properly with the branch of the other mirror of the SVN repository that I have been using as the trunk so far, such that I can continue to download updates and have [i]just[/i] the changes since the previous versions applied?
>
>
> On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>>
>> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>>
>> Any suggestions about how to deal with the other problem?
>>
>
> It looks like GitHub won't keep the project in sync for you, so you're
> probably best off doing the git-svn clone yourself, and maintaining it
> that way.
>
> http://github.com/guides/import-from-subversion
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550565.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
You should be able to use the exact command I showed earlier within
"git bash". Also, you'd want to type "git help svn", not "svn --help"
to see the manual.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550633.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: Jacob Helwig @ 2009-03-28 22:04 UTC (permalink / raw)
To: jamespetts; +Cc: git
In-Reply-To: <1238276809892-2550565.post@n2.nabble.com>
On Sat, Mar 28, 2009 at 14:46, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you for your reply. Unfortunately, I cannot for the life of me get git-svn to work. It refuses to recognise "git svn" as a valid command, and "svn" does not appear in the list of commands when I type, "svn --help" in Git Bash (I am using Git in Windows, if that makes any difference). I tried to look for svn2git, but the homepage linked from the link that you gave me produced a 404.
>
> Also, once I have managed to create a Git clone of the SVN repository myself, how do I synchronise that properly with the branch of the other mirror of the SVN repository that I have been using as the trunk so far, such that I can continue to download updates and have [i]just[/i] the changes since the previous versions applied?
>
>
> On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>>
>> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>>
>> Any suggestions about how to deal with the other problem?
>>
>
> It looks like GitHub won't keep the project in sync for you, so you're
> probably best off doing the git-svn clone yourself, and maintaining it
> that way.
>
> http://github.com/guides/import-from-subversion
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550565.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
You should be able to use the exact command I showed earlier within
"git bash". Also, you'd want to type "git help svn", not "svn --help"
to see the manual.
^ permalink raw reply
* Re: git svn fails to work
From: Jacob Helwig @ 2009-03-28 22:01 UTC (permalink / raw)
To: Aaron Gray; +Cc: Git Mailing List
In-Reply-To: <AE2ECDC6B332479293D910D9352DCF21@HPLAPTOP>
On Sat, Mar 28, 2009 at 14:43, Aaron Gray
<aaronngray.lists@googlemail.com> wrote:
>> On Sat, Mar 28, 2009 at 8:48 PM, Aaron Gray
>> <aaronngray.lists@googlemail.com> wrote:
>>>
>>> I have been tying for a week to get git svn to work. If i do a 'git
>>> clone'
>>> and if falls over 'git svn fetch' picks up from where it left off, but on
>>> completion I can only see the older stuff if at all and a 'git clone
>>> rebase'
>>> eithr shoud up unreconsilable differences or refuses to execute the
>>> command
>>> at all, gust giving uphelpfull help afaics.
>>
>> I am afraid if you expect anyone to help you with you, you have to spend
>> a little more time to describe your problem. You have not mentioned what
>> version of Git you use, what operating system, what is layout of your SVN
>> repo, what commands and with what options you used and what was their
>> output. Without that information no one will be able to help you...
>>
>>> Otherwise I am giving up and either going back to svn or over to
>>> mercurial.
>>
>> Yeah, right... These kind of threats will make people who want to help to
>> come running....
>
> Sorry, but I am very frustrated with the whole thing, there is not real user
> guides for git-svn other that third party ones which seem to be wrong.
>
> I am using Fedora 10, GIT 1.6.0.6, the svn repo is standard layout although
> I only want trunk, it here :-
>
> svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm
>
> This is quite a big repository 65000 or more revisions.
>
> The commands
>
> git svn clone http://llvm.org/svn/llvm-project/llvm/trunk
>
> when connection fails I do a :-
>
> git svn fetch
>
> gitweb is not updating at all to show any change in the repository.
>
> Aaron
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
gitweb will only show your local branches. git svn fetch will update
the remote branches associated with svn. You'll need to create a
local tracking branch for the svn remote branch.
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: jamespetts @ 2009-03-28 22:01 UTC (permalink / raw)
To: git
In-Reply-To: <fabb9a1e0903281455x3ea64688tef08524fe0c43347@mail.gmail.com>
Yes, indeed, as stated in the above post, I am using Windows :-)
Heya,
On Sat, Mar 28, 2009 at 22:46, jamespetts <jamespetts@yahoo.com> wrote:
> Thank you for your reply. Unfortunately, I cannot for the life of me get
> git-svn to work. It refuses to recognise "git svn" as a valid command,
What version are you using? Are you on Windows perhaps?
--
Cheers,
Sverre Rabbelier
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550590.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: Sverre Rabbelier @ 2009-03-28 21:55 UTC (permalink / raw)
To: jamespetts; +Cc: git
In-Reply-To: <1238276809892-2550565.post@n2.nabble.com>
Heya,
On Sat, Mar 28, 2009 at 22:46, jamespetts <jamespetts@yahoo.com> wrote:
> Thank you for your reply. Unfortunately, I cannot for the life of me get
> git-svn to work. It refuses to recognise "git svn" as a valid command,
What version are you using? Are you on Windows perhaps?
--
Cheers,
Sverre Rabbelier
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: jamespetts @ 2009-03-28 21:46 UTC (permalink / raw)
To: git
In-Reply-To: <8c9a060903281327j33056807j78a2cd03b8151979@mail.gmail.com>
Thank you for your reply. Unfortunately, I cannot for the life of me get git-svn to work. It refuses to recognise "git svn" as a valid command, and "svn" does not appear in the list of commands when I type, "svn --help" in Git Bash (I am using Git in Windows, if that makes any difference). I tried to look for svn2git, but the homepage linked from the link that you gave me produced a 404.
Also, once I have managed to create a Git clone of the SVN repository myself, how do I synchronise that properly with the branch of the other mirror of the SVN repository that I have been using as the trunk so far, such that I can continue to download updates and have [i]just[/i] the changes since the previous versions applied?
On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>
> Any suggestions about how to deal with the other problem?
>
It looks like GitHub won't keep the project in sync for you, so you're
probably best off doing the git-svn clone yourself, and maintaining it
that way.
http://github.com/guides/import-from-subversion
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2550565.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: git svn fails to work
From: Aaron Gray @ 2009-03-28 21:43 UTC (permalink / raw)
To: Git Mailing List
In-Reply-To: <37fcd2780903281351w6f77a647kd44a9afe4d2ee953@mail.gmail.com>
> On Sat, Mar 28, 2009 at 8:48 PM, Aaron Gray
> <aaronngray.lists@googlemail.com> wrote:
>> I have been tying for a week to get git svn to work. If i do a 'git
>> clone'
>> and if falls over 'git svn fetch' picks up from where it left off, but on
>> completion I can only see the older stuff if at all and a 'git clone
>> rebase'
>> eithr shoud up unreconsilable differences or refuses to execute the
>> command
>> at all, gust giving uphelpfull help afaics.
>
> I am afraid if you expect anyone to help you with you, you have to spend
> a little more time to describe your problem. You have not mentioned what
> version of Git you use, what operating system, what is layout of your SVN
> repo, what commands and with what options you used and what was their
> output. Without that information no one will be able to help you...
>
>> Otherwise I am giving up and either going back to svn or over to
>> mercurial.
>
> Yeah, right... These kind of threats will make people who want to help to
> come running....
Sorry, but I am very frustrated with the whole thing, there is not real user
guides for git-svn other that third party ones which seem to be wrong.
I am using Fedora 10, GIT 1.6.0.6, the svn repo is standard layout although
I only want trunk, it here :-
svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm
This is quite a big repository 65000 or more revisions.
The commands
git svn clone http://llvm.org/svn/llvm-project/llvm/trunk
when connection fails I do a :-
git svn fetch
gitweb is not updating at all to show any change in the repository.
Aaron
^ permalink raw reply
* Re: git svn fails to work
From: Dmitry Potapov @ 2009-03-28 20:51 UTC (permalink / raw)
To: Aaron Gray; +Cc: Git Mailing List
In-Reply-To: <EA1460555FA0423EB6C233B3B0F4F098@HPLAPTOP>
On Sat, Mar 28, 2009 at 8:48 PM, Aaron Gray
<aaronngray.lists@googlemail.com> wrote:
> I have been tying for a week to get git svn to work. If i do a 'git clone'
> and if falls over 'git svn fetch' picks up from where it left off, but on
> completion I can only see the older stuff if at all and a 'git clone rebase'
> eithr shoud up unreconsilable differences or refuses to execute the command
> at all, gust giving uphelpfull help afaics.
I am afraid if you expect anyone to help you with you, you have to spend
a little more time to describe your problem. You have not mentioned what
version of Git you use, what operating system, what is layout of your SVN
repo, what commands and with what options you used and what was their
output. Without that information no one will be able to help you...
> Otherwise I am giving up and either going back to svn or over to mercurial.
Yeah, right... These kind of threats will make people who want to help to
come running....
Dmitry
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: Jacob Helwig @ 2009-03-28 20:27 UTC (permalink / raw)
To: jamespetts; +Cc: git
In-Reply-To: <1238263580197-2549943.post@n2.nabble.com>
On Sat, Mar 28, 2009 at 11:06, jamespetts <jamespetts@yahoo.com> wrote:
>
> Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
>
> Any suggestions about how to deal with the other problem?
>
It looks like GitHub won't keep the project in sync for you, so you're
probably best off doing the git-svn clone yourself, and maintaining it
that way.
http://github.com/guides/import-from-subversion
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: jamespetts @ 2009-03-28 18:06 UTC (permalink / raw)
To: git
In-Reply-To: <8c9a060903281102r3eae26edta34899485feb884b@mail.gmail.com>
Thank you very much for your reply :-) Ahh, I didn't realise that that sort of SVN URL should be avoided. Is there any way around that when the project itself uses that sort of URL? And I think that it does require a username and empty password. I haven't tried the Github IRC channel - I must confess - I did not know that there was one.
Any suggestions about how to deal with the other problem?
The GitHub "Import a Subversion Repository" page does mention that you
should try to avoid "svn://example.com/project/svn" style URLs (which
SimuTrans uses). Maybe it's having trouble with needing a username &
empty password?
Unfortunately, I've never actually used the "Import from SVN" on
GitHub. I see you've already posted to http://support.github.com/
about this. Have you tried asking in the GitHub IRC channel?
On Sat, Mar 28, 2009 at 09:46, jamespetts <jamespetts@yahoo.com> wrote:
>
>
>
> I just tried cloning this repo using the command below, and it appears
> to be working just fine. (Hasn't finished, yet. Up to rev 465.) What
> is the full command you're using when it will hang?
>
> I was not using the command line - I was using the GUI on the Github website.
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2549665.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--
View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2549943.html
Sent from the git mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Fork of abandoned SVN mirror - how to keep up to date with the SVN
From: Jacob Helwig @ 2009-03-28 18:02 UTC (permalink / raw)
To: jamespetts; +Cc: git
In-Reply-To: <1238258794470-2549665.post@n2.nabble.com>
The GitHub "Import a Subversion Repository" page does mention that you
should try to avoid "svn://example.com/project/svn" style URLs (which
SimuTrans uses). Maybe it's having trouble with needing a username &
empty password?
Unfortunately, I've never actually used the "Import from SVN" on
GitHub. I see you've already posted to http://support.github.com/
about this. Have you tried asking in the GitHub IRC channel?
On Sat, Mar 28, 2009 at 09:46, jamespetts <jamespetts@yahoo.com> wrote:
>
>
>
> I just tried cloning this repo using the command below, and it appears
> to be working just fine. (Hasn't finished, yet. Up to rev 465.) What
> is the full command you're using when it will hang?
>
> I was not using the command line - I was using the GUI on the Github website.
> --
> View this message in context: http://n2.nabble.com/Fork-of-abandoned-SVN-mirror---how-to-keep-up-to-date-with-the-SVN-tp2548952p2549665.html
> Sent from the git mailing list archive at Nabble.com.
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* git svn fails to work
From: Aaron Gray @ 2009-03-28 17:48 UTC (permalink / raw)
To: Git Mailing List
I have been tying for a week to get git svn to work. If i do a 'git clone'
and if falls over 'git svn fetch' picks up from where it left off, but on
completion I can only see the older stuff if at all and a 'git clone rebase'
eithr shoud up unreconsilable differences or refuses to execute the command
at all, gust giving uphelpfull help afaics.
Does anyone have a real work how to for git svn ?
Otherwise I am giving up and either going back to svn or over to mercurial.
Aaron
^ permalink raw reply
* [EGIT] How to deal with important modifications
From: Yann Simon @ 2009-03-28 17:32 UTC (permalink / raw)
To: Robin Rosenberg, Shawn O. Pearce; +Cc: git
Hi,
I am working on the synchronization view. It is not 100% functional yet.
The view is not updated when a local file is modified for example.
As the modifications are getting important, I was wondering how to deal
with it. Should I continue my work an send all the patches when
finished?
To have an overview of the modifications:
http://github.com/yanns/egit/commit/18c4a928d53345802a8c9641dcb2d457ebbe2cbc
http://github.com/yanns/egit/commit/9fab398fa1b7b6efa9532b3c09e5bcfcc8bb9419
Or should I begin to send patches, but by not activating the function
yet?
(It could be a way to have other people to help contributing.)
Yann
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox