[PATCH v7 00/11] transport-helper: updates

2013-11-12 Thread Felipe Contreras
Hi,

Here are the patches that allow transport helpers to be completely transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting forced update, everything works.

Changes since v6:

diff --git a/contrib/remote-helpers/test-hg.sh 
b/contrib/remote-helpers/test-hg.sh
index 72f745d..aacd8a9 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -599,7 +599,7 @@ test_expect_success 'remote big push fetch first' '
)
 '
 
-test_expect_failure 'remote big push force' '
+test_expect_success 'remote big push force' '
test_when_finished rm -rf hgrepo gitrepo* 
 
setup_big_push
@@ -629,7 +629,7 @@ test_expect_failure 'remote big push force' '
check_bookmark hgrepo new_bmark six
 '
 
-test_expect_failure 'remote big push dry-run' '
+test_expect_success 'remote big push dry-run' '
test_when_finished rm -rf hgrepo gitrepo* 
 
setup_big_push
diff --git a/transport-helper.c b/transport-helper.c
index 2257588..7a95125 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -863,7 +863,7 @@ static int push_refs_with_export(struct transport 
*transport,
 
if (flags  TRANSPORT_PUSH_FORCE) {
if (set_helper_option(transport, force, true) != 0)
-   die(helper %s does not support 'force', data-name);
+   warning(helper %s does not support 'force', 
data-name);
}
 
helper = get_helper(transport);

Felipe Contreras (10):
  transport-helper: fix extra lines
  transport-helper: don't update refs in dry-run
  transport-helper: add 'force' to 'export' helpers
  transport-helper: check for 'forced update' message
  fast-export: improve argument parsing
  fast-export: add new --refspec option
  transport-helper: add support for old:new refspec
  fast-import: add support to delete refs
  fast-export: add support to delete refs
  transport-helper: add support to delete branches

Richard Hansen (1):
  test-hg.sh: tests are now expected to pass

 Documentation/git-fast-export.txt   |  4 +++
 Documentation/git-fast-import.txt   |  3 +++
 Documentation/gitremote-helpers.txt |  4 +++
 builtin/fast-export.c   | 49 -
 contrib/remote-helpers/test-hg.sh   |  4 +--
 fast-import.c   | 13 +++---
 git-remote-testgit.sh   | 18 ++
 t/t5801-remote-helpers.sh   | 23 -
 t/t9300-fast-import.sh  | 18 ++
 t/t9350-fast-export.sh  | 18 ++
 transport-helper.c  | 47 +++
 11 files changed, 179 insertions(+), 22 deletions(-)

-- 
1.8.4.2+fc1

--
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


Re: [PATCH v7 00/11] transport-helper: updates

2013-11-12 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes:

 Here are the patches that allow transport helpers to be completely 
 transparent;

Thanks, will replace what is on 'pu'.

 Felipe Contreras (10):
   transport-helper: fix extra lines

I'll retitle this one to mismerge fix to make it clear where the
blame lies ;-)
--
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