From 1b1a4987d0e14f869b9b87d2f5f68a34f0d9f121 Mon Sep 17 00:00:00 2001 From: kindly Date: Fri, 11 Nov 2011 11:17:40 +0000 Subject: [PATCH] [git] few fixes due to change to git --- MANIFEST.in | 2 +- fabfile.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 28b805cfe42..82da5a96c39 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,7 +5,7 @@ recursive-include ckan/config *.xml recursive-include ckan/i18n * recursive-include ckan/templates * recursive-include ckan *.ini -prune .hg +prune .git include CHANGELOG.txt include ckan/migration/migrate.cfg recursive-include ckan_deb * diff --git a/fabfile.py b/fabfile.py index b9674d0c1d0..5b9c84944a0 100644 --- a/fabfile.py +++ b/fabfile.py @@ -354,9 +354,8 @@ def status(): _run_in_cmd_pyenv('pip freeze') run('cat %s' % env.config_ini_filename) with cd(os.path.join(env.pyenv_dir, 'src', 'ckan')): - run('hg log -l 1') - run('hg branch') - run('hg identify') + run('git log -n1') + run('git name-rev --name-only HEAD') run('grep version ckan/__init__.py') def apache_config(set_config=None):