x/git-upstream
Code Issues Proposed changes

Commit Graph

  • a4062de4ae Switch to using fixtures-git for testing master Darragh Bailey 2018-03-10 11:17:45 +00:00
  • 25f950e0e4 Update requirements to align Darragh Bailey 2020-01-13 15:11:47 +00:00
  • 5c6e9bad1a Use better email for myself Jon-Paul Sullivan 2019-11-28 14:52:52 +00:00
  • 1c6ac903da Update docs jobs Andreas Jaeger 2019-05-20 08:14:09 +02:00
  • e500ba04d3 OpenDev Migration Patch OpenDev Sysadmins 2019-04-19 19:51:36 +00:00
  • 82083c4353 Migrate to managing job config in-repo Darragh Bailey 2018-07-21 08:57:57 +01:00
  • 95e6c5bea5 Align with openstack check-requirements Darragh Bailey 2018-06-29 13:01:47 +01:00
  • 954604e8fe Merge "Support recent git changes to merge options" Zuul 2018-04-27 17:59:00 +00:00
  • 70c844ba9d Merge "Handle explicit merges" Zuul 2018-04-27 17:55:43 +00:00
  • e0289362b8 Trivial: Update pypi url to new url melissaml 2018-04-21 04:46:38 +08:00
  • f54e0d120d Support recent git changes to merge options Darragh Bailey 2018-03-10 10:17:04 +00:00
  • 350be21af3 Handle explicit merges Darragh Bailey 2018-01-24 12:19:17 +00:00
  • 0c33431d2e Correct typo and add a few additional debug statements Darragh Bailey 2018-01-24 12:10:03 +00:00
  • 3e1718f87c Merge "Consolidate some author email addresses" Jenkins 2017-06-26 11:04:13 +00:00
  • c9e66d7de8 Merge "Update to latest Sphinx for documentation" Jenkins 2017-04-14 09:25:29 +00:00
  • f60d242137 Update to latest Sphinx for documentation Darragh Bailey 2017-04-10 15:43:35 +01:00
  • 6c7d1b50b9 Consolidate some author email addresses Darragh Bailey 2017-04-10 15:39:15 +01:00
  • 6415738c1c Handle multiple non-contributing commits being merged Darragh Bailey 2016-12-07 17:44:32 +00:00
  • ccae7b1a63 Handle non contributing merges where no import Darragh Bailey 2016-12-07 16:46:15 +00:00
  • 0100a7e1d5 Find better import merge commit candidate Darragh Bailey 2016-12-07 16:35:37 +00:00
  • 7cffd9dc0b Include merge commit being examined in debug log Darragh Bailey 2016-12-07 16:34:58 +00:00
  • cba4bdaefa Merge "Exclude some unnecessary merge commits from history" Jenkins 2017-03-16 10:48:50 +00:00
  • 7220bd7994 Exclude some unnecessary merge commits from history Darragh Bailey 2016-12-07 15:17:57 +00:00
  • 5de57e8b26 Add docs on how the import branch is named Paul Bourke 2017-02-17 15:37:59 +00:00
  • e4190ff279 Fix test and resulting random failures Darragh Bailey 2016-12-07 15:01:47 +00:00
  • b23fcdf571 Clean up basic inaccuracies in documentation Darragh Bailey 2016-11-14 18:09:01 +00:00
  • e85a2bad98 Tidy up subcommands page title Darragh Bailey 2016-11-28 13:01:37 +00:00
  • fe410ecf2f Merge "Update README and better divide inclusion into main docs" Jenkins 2017-02-10 13:48:19 +00:00
  • dd9c80d3fe Update README and better divide inclusion into main docs Darragh Bailey 2016-11-28 12:59:04 +00:00
  • 2d04fcdb7f Merge "Fix searcher debug output" Jenkins 2017-01-31 18:13:28 +00:00
  • caa7b5270d Switch to range from xrange for python 3 compatibility Darragh Bailey 2016-12-08 11:06:29 +00:00
  • 2c3a1d2bcf Fix searcher debug output Manuel Desbonnet 2016-12-06 14:52:59 +00:00
  • 34c72e9e39 Merge "Regression test for sequence editor causing hang" Jenkins 2016-11-28 11:23:44 +00:00
  • dc0ee3549f Merge "Simplify custom logging classes" Jenkins 2016-11-22 11:54:48 +00:00
  • dfa212ffd0 Regression test for sequence editor causing hang Darragh Bailey 2016-09-19 18:16:22 +01:00
  • 7f8a63be12 Merge "Expand on ambiguous arguments in test description" Jenkins 2016-11-18 17:25:44 +00:00
  • 1f10853f24 Support GitHub cross references using source files Darragh Bailey 2016-11-11 18:14:50 +00:00
  • a52f01f894 Merge "Use sphinxcontrib-fulltoc" Jenkins 2016-11-17 15:30:48 +00:00
  • 9d8c428441 Merge "Modify README to allow partial include" Jenkins 2016-11-16 15:22:39 +00:00
  • 363a88bf22 Use sphinxcontrib-fulltoc Darragh Bailey 2016-11-07 18:23:41 +00:00
  • 508409a43f Merge "Ensure logging is checked by most tests" Jenkins 2016-11-16 10:00:05 +00:00
  • adc18a19db Expand on ambiguous arguments in test description Darragh Bailey 2016-10-04 11:06:44 +01:00
  • 4af052ae8f Modify README to allow partial include Darragh Bailey 2016-11-07 18:20:33 +00:00
  • 65cb8e2004 Add basic documentation and migrate README & USAGE Darragh Bailey 2016-11-07 18:17:33 +00:00
  • 360d839abe Switch to ReSTructured text from markdown Darragh Bailey 2016-11-07 12:13:39 +00:00
  • 4e7c1fe0f9 Merge "Fix read-the-docs doc building" Jenkins 2016-11-11 15:22:04 +00:00
  • e3867dcea4 Fix read-the-docs doc building Darragh Bailey 2016-11-11 12:54:58 +00:00
  • d45998bf05 Add tox env for checking links in docs Darragh Bailey 2016-11-08 12:13:32 +00:00
  • abb34a9a61 Fix docs build manpage on python3 Darragh Bailey 2016-11-07 18:25:43 +00:00
  • bbf251148c Update ChangeLog for 0.12.1 0.12.1 Darragh Bailey 2016-11-02 15:36:55 +00:00
  • 98b283ec37 Include files for sphinx based documentation Darragh Bailey 2016-10-25 13:38:07 +01:00
  • b95b257fe1 Auto build and install default man page Darragh Bailey 2016-10-25 12:40:18 +01:00
  • ac76015552 Move build_manpage utility to doc area Darragh Bailey 2016-10-25 12:39:08 +01:00
  • bc9fc649f6 Ensure correct prog name available to manpage Darragh Bailey 2016-10-24 14:31:07 +01:00
  • d2c030637b Update authors Darragh Bailey 2016-10-24 14:28:51 +01:00
  • 2455b7e10e Remove requirement sphinxcontrib-programoutput Darragh Bailey 2016-11-01 12:46:31 +00:00
  • 60774fb22d Simplify custom logging classes Darragh Bailey 2016-09-20 17:51:37 +01:00
  • 8d5fbf9388 Ensure logging is checked by most tests Darragh Bailey 2016-10-19 13:05:52 +01:00
  • d50f0a398a Changelog for 0.12.0 Release 0.12.0 Darragh Bailey 2016-10-19 17:43:27 +01:00
  • 7dd634a371 Fix help subcommand Darragh Bailey 2016-10-17 14:16:27 +01:00
  • 5c0a4a7e4d Remove compatibility hacks causing issues with newer GitPython Darragh Bailey 2016-10-17 11:26:44 +01:00
  • 691ae783e0 Check valid import branch argument value Darragh Bailey 2016-10-04 17:06:02 +01:00
  • 0e30d3898b Report import branch name used by default Darragh Bailey 2016-10-04 15:46:50 +01:00
  • f243bd6355 Use tag for import branch naming when given Darragh Bailey 2016-10-04 14:43:29 +01:00
  • bb152bb522 Merge "Use python for pre/post scripts" Jenkins 2016-10-04 10:13:14 +00:00
  • be781cc50b Support tags for input args Darragh Bailey 2016-09-27 17:52:41 +01:00
  • 5f4038e268 Allow SHA1 as reference for inputs Darragh Bailey 2016-09-27 16:47:28 +01:00
  • 7897e35491 Use python for pre/post scripts Darragh Bailey 2016-09-30 12:19:28 +01:00
  • 47092a9b63 Fix finish merge to ensure correct contents Darragh Bailey 2016-09-30 11:09:31 +01:00
  • 54d48766ae Always have rebase perform finish Darragh Bailey 2016-09-28 12:12:12 +01:00
  • a24debcbf8 Ensure correct mode of git-rebase executed Darragh Bailey 2016-09-19 18:44:23 +01:00
  • db6bc6b194 Merge "Support old GitPython transform_kwargs signature" Jenkins 2016-09-29 16:25:36 +00:00
  • ae85853eab Merge "Refactor test to allow additional" Jenkins 2016-09-29 16:25:31 +00:00
  • 66846f0dc2 Merge "Ensure parent options retained for exec'ed finish" Jenkins 2016-09-29 16:07:39 +00:00
  • d8bb479880 Ensure parent options retained for exec'ed finish Darragh Bailey 2016-09-28 13:14:03 +01:00
  • 9e077c56b9 Support old GitPython transform_kwargs signature Darragh Bailey 2016-09-20 12:34:51 +01:00
  • c5f6cc2b3a Merge "Fix access for pre-script dict member" Jenkins 2016-09-28 14:33:09 +00:00
  • 79b31d95d1 Refactor test to allow additional Darragh Bailey 2016-09-27 16:35:24 +01:00
  • 3b5e2415c3 Fix access for pre-script dict member Darragh Bailey 2016-09-19 18:12:38 +01:00
  • b7dc443ea0 Update .gitignore with .eggs path for setuptools Darragh Bailey 2016-07-04 12:50:13 +01:00
  • 7a135a1705 Enable default GIT_PYTHON_TRACE for tests Darragh Bailey 2016-07-04 12:48:22 +01:00
  • 71be556ab5 Merge "Consolidate to a single separator character" Jenkins 2016-09-16 13:52:46 +00:00
  • be9c5d49e4 Merge "Fix broken interactive mode to be usable" Jenkins 2016-09-16 13:49:40 +00:00
  • f7c33a0630 Merge "Record upstream branch in import merge commit" Jenkins 2016-09-16 13:48:13 +00:00
  • 097b5275b5 Merge "Handle all local changes landed upstream" Jenkins 2016-09-16 13:32:13 +00:00
  • 1385263761 Merge "Detect cherry-picked changes without Change-Id" Jenkins 2016-09-16 09:15:44 +00:00
  • 26c427450b Consolidate to a single separator character Darragh Bailey 2016-02-22 23:01:17 +00:00
  • 10e8f92069 Example in USAGE.md should reference .gitreview Mathieu Gagné 2016-09-02 18:16:47 -04:00
  • c195b69c6b Fix broken interactive mode to be usable Darragh Bailey 2016-02-04 12:12:40 +00:00
  • 307637d8b6 Record upstream branch in import merge commit Darragh Bailey 2016-07-20 11:04:59 +01:00
  • e231483adc Handle all local changes landed upstream Darragh Bailey 2016-07-04 11:25:02 +01:00
  • 8ab6ccc3be Detect cherry-picked changes without Change-Id Darragh Bailey 2016-06-27 18:43:07 +01:00
  • a05425f161 Use a recent pbr Alexis Lee 2016-08-04 16:25:50 +01:00
  • f37890bb31 Add tool to recreate git repo from test scenarios Darragh Bailey 2016-06-27 16:30:58 +01:00
  • 90bf42d5d6 Detect when nothing to import Darragh Bailey 2016-06-22 15:51:50 +01:00
  • 343c3e7ede Merge multiple unrelated additional branches Darragh Bailey 2016-06-22 12:05:19 +01:00
  • 62def85b6b Support for python 3 Darragh Bailey 2016-06-09 18:16:15 +01:00
  • 00377869a9 Show rebase help during interactive import Paul Bourke 2016-05-26 13:05:44 +01:00
  • e52e277dd7 Merge "Simplify USAGE.md example by using a local remote" Jenkins 2016-05-18 17:54:31 +00:00
  • 45a617ac3a Simplify USAGE.md example by using a local remote Paul Bourke 2016-05-18 16:30:47 +01:00