Remove remaining HP references

README

@@ -39,7 +39,7 @@ This means jobs run by Jenkins can save a detailed log file separately as an art
 
   It’s always possible for local changes to be superseded by upstream changes, so when these are identified and marked as such, we should drop them.
 
-  This can also occur where a change was applied locally, modified when being upstreamed based on review feedback and the resulting differences were ported to the HP project as well. While the original change will be automatically dropped, also useful to drop the additional ported changes automatically if possible, rather than have it cause conflicts.
+  This can also occur where a change was applied locally, modified when being upstreamed based on review feedback and the resulting differences were ported to the internal as well. While the original change will be automatically dropped, also useful to drop the additional ported changes automatically if possible, rather than have it cause conflicts.
 
 # Using git-upstream
 
@@ -162,6 +162,6 @@ To *Davide Guerri*, for picking up a rough python tool and turning it into somet
 
 Also to *Jon Paul Sullivan* and *Monty Taylor* to listening and providing a sounding board for different approaches.
 
-And finally to *Coleman Corrigan* among numerous others who acted as willing guinea pigs for the original manual approach. 
+And finally to *Coleman Corrigan* among numerous others who acted as willing guinea pigs for the original manual approach.
 
 Hope this eventually helped save you time and some hair.

USAGE.md

@@ -10,7 +10,7 @@ At the time of writing the only way to get git-upstream is to clone it from its
 git repository.
 
 ```bash
-git clone git@gitlabhq.hpcloud.net:git-upstream
+git clone https://github.com/dguerri/git-upstream.git
 cd git-upstream
 # Install git-upstream itself
 python setup.py install
@@ -19,7 +19,7 @@ python setup.py install
 Or
 
 ```bash
-git clone git@gitlabhq.hpcloud.net:git-upstream
+git clone https://github.com/dguerri/git-upstream.git
 cd git-upstream
 easy_install .
 ```
@@ -39,28 +39,13 @@ pip show git-upstream
 ---
 Name: git-upstream
 Version: unknown-version
-Location: /Users/davide/Developer/HP/ve-git-upstream/lib/python2.7/site-packages/git-upstream-unknown_version-py2.7.egg
+Location: ../ve-git-upstream/lib/python2.7/site-packages/git-upstream-unknown_version-py2.7.egg
 Requires: GitPython
 
 ~# git-upstream --help
 usage: git-upstream [--version] [-h] [-q | -v] <command> ...
-Command-line tool for the HP Cloud workflow Main parser module, which after
-parsing the top level options will hand off to the collected subcommands
-parsers.
-optional arguments:
-  --version      show program's version number and exit
-  -h, --help     show this help message and exit
-  -q, --quiet    Suppress additional output except for errors, conflicts with
-                 --verbose
-  -v, --verbose  Increase verbosity from commands, conflicts with --quiet. May
-                 be set more than once.
-commands:
-  <command>
-    help         Display help about this program or one of its commands.
-    drop         Mark a commit as dropped.
-    import       Import code from specified upstream branch.
-    supersede    Mark a commit as superseded by a set of change-ids.
-See "git-upstream help COMMAND" for help on a specific command.
+
+[...]
 ```
 
 ## Initial import of an upstream project

functional-tests/run_tests.sh

@@ -78,7 +78,7 @@ fi
 log DEBUG "Installing git-upstream"
 easy_install -q $INSTALL_DIR >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-  log ERROR "hp git installation failed!"
+  log ERROR "git-upstream installation failed!"
   exit 1
 fi
 
@@ -92,4 +92,4 @@ else
   for test in $(ls [[:digit:]][[:digit:]][[:digit:]]-test*); do
     $BASE_DIR/$test
   done
-fi
+fi

git_upstream/log.py

@@ -17,7 +17,7 @@
 
 
 """
-Custom logging for HP git tool
+Custom logging for git-upstream tool
 
 Adds new 'NOTICE' level to standard logging library and provides helper
 functions for verbose/quiet CLI args to retreive the appropriate level

git_upstream/rebase_editor.py

@@ -124,3 +124,4 @@ def main():
 
 if __name__ == '__main__':
     return main()
+

setup.cfg

@@ -9,28 +9,31 @@ summary = git tool to help manage upstream repositories
 description-file = README
 license = Apache License (2.0)
 keywords = git upstream workflow
-classifiers =
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 3
-    Programming Language :: Python
-    Development Status :: 4 - Beta
-    Environment :: Console
-    Environment :: OpenStack
-    Intended Audience :: Developers
-    Intended Audience :: Information Technology
-    License :: OSI Approved :: Apache Software License
-    Operating System :: OS Independent
+classifiers = 
+	Programming Language :: Python :: 2
+	Programming Language :: Python :: 3
+	Programming Language :: Python
+	Development Status :: 4 - Beta
+	Environment :: Console
+	Environment :: OpenStack
+	Intended Audience :: Developers
+	Intended Audience :: Information Technology
+	License :: OSI Approved :: Apache Software License
+	Operating System :: OS Independent
 
 [global]
 commands = build_manpage.BuildManpage
 
 [files]
-packages =
-    git_upstream
-data_files =
-    etc/bash_completion.d = bash_completion/git-upstream
+packages = 
+	git_upstream
+data_files = 
+	etc/bash_completion.d = bash_completion/git-upstream
 
 [entry_points]
-console_scripts =
-    git-upstream = git_upstream.main:main
-    rebase-editor = git_upstream.rebase_editor:main
+console_scripts = 
+	git-upstream = git_upstream.main:main
+	rebase-editor = git_upstream.rebase_editor:main
+
+[easy_install]
+