示例#1
0
import os
import subprocess
import random
import hashlib
import sys
from util import copy_example_files

SCRIPTS_DIR = os.path.realpath(os.path.dirname(__file__))
EXAMPLE_NOTEBOOKS = os.path.join(SCRIPTS_DIR, 'example-notebooks/diff/')

example_diff_notebooks = os.listdir(EXAMPLE_NOTEBOOKS)

randpart = hashlib.sha1(str(random.random())).hexdigest()[:4]

folder_name = "merge-diff-testfolder-{}".format(randpart)
os.mkdir(folder_name)
os.chdir(folder_name)

subprocess.check_output('git init'.split())

copy_example_files('before.ipynb', EXAMPLE_NOTEBOOKS, example_diff_notebooks)

subprocess.check_output(['git', 'commit', '-am', 'b'])

copy_example_files('after.ipynb',
                   EXAMPLE_NOTEBOOKS,
                   example_diff_notebooks,
                   add=False)

print 'Diffable notebook available in folder: \n' + folder_name
示例#2
0
文件: make_diff.py 项目: 9x/nbdiff
import os
import subprocess
import random
import hashlib
import sys
from util import copy_example_files

SCRIPTS_DIR = os.path.realpath(os.path.dirname(__file__))
EXAMPLE_NOTEBOOKS = os.path.join(SCRIPTS_DIR, 'example-notebooks/diff/')

example_diff_notebooks = os.listdir(EXAMPLE_NOTEBOOKS)

randpart = hashlib.sha1(str(random.random())).hexdigest()[:4]

folder_name = "merge-diff-testfolder-{}".format(randpart)
os.mkdir(folder_name)
os.chdir(folder_name)

subprocess.check_output('git init'.split())


copy_example_files('before.ipynb', EXAMPLE_NOTEBOOKS, example_diff_notebooks)

subprocess.check_output(['git', 'commit', '-am', 'b'])

copy_example_files('after.ipynb',EXAMPLE_NOTEBOOKS, example_diff_notebooks, add=False)

print 'Diffable notebook available in folder: \n' + folder_name

示例#3
0
VCS_CMD = MERCURIAL and 'hg' or 'git'

SCRIPTS_DIR = os.path.realpath(os.path.dirname(__file__))
EXAMPLE_NOTEBOOKS = os.path.join(SCRIPTS_DIR, 'example-notebooks/merge/')

example_merge_notebooks = os.listdir(EXAMPLE_NOTEBOOKS)

randpart = hashlib.sha1(str(random.random())).hexdigest()[:4]
folder_name = "merge-conflict-testfolder-{}".format(randpart)

os.mkdir(folder_name)
os.chdir(folder_name)

subprocess.check_output([VCS_CMD, 'init'])

copy_example_files('base.ipynb', EXAMPLE_NOTEBOOKS, example_merge_notebooks, vcs_cmd=VCS_CMD)

if MERCURIAL:
    subprocess.check_output(['hg', 'commit', '-A', '-m', 'b'])
    subprocess.check_output('hg bookmark main'.split())
    subprocess.check_output('hg bookmark friend'.split())
    subprocess.check_output('hg update friend'.split())
else:
    subprocess.check_output(['git', 'commit', '-am', 'b'])
    subprocess.check_output('git checkout -b your-friends-branch'.split())


copy_example_files('remote.ipynb', EXAMPLE_NOTEBOOKS, example_merge_notebooks, vcs_cmd=VCS_CMD)

if MERCURIAL:
    subprocess.check_output(['hg', 'commit', '-A', '-m', 'r'], stderr=sys.stdout)