구차니의 잡동사니 모음

git fetch(서버에서 받아오기)

git merge(병합)

>> git pull

git checkout (브랜치 선택)

git commit 로컬 저장소 저장

git push 원격 저장소 저장

git clone

git init (로컬 저장소 생성)

git remote add repo (로컬 저장소와 원격저장소 연결)

git pull (원격 저장소의 정보를 내려받음)

>> git clone repo (로컬 저장소와 원격저장소 동일) 

$ svn list file:///home/pi/repo@2 --verbose 

$ svn help list

list (ls): List directory entries in the repository.

usage: list [TARGET[@REV]...]

  List each TARGET file and the contents of each TARGET directory as

  they exist in the repository.  If TARGET is a working copy path, the

  corresponding repository URL will be used. If specified, REV determines

  in which revision the target is first looked up.

  The default TARGET is '.', meaning the repository URL of the current

  working directory.

  With --verbose, the following fields will be shown for each item:

    Revision number of the last commit

    Author of the last commit

    If locked, the letter 'O'.  (Use 'svn info URL' to see details)

    Size (in bytes)

    Date and time of the last commit

Valid options:

  -r [--revision] ARG      : ARG (some commands also take ARG1:ARG2 range)

                             A revision argument can be one of:

                                NUMBER       revision number

                                '{' DATE '}' revision at start of the date

                                'HEAD'       latest in repository

                                'BASE'       base rev of item's working copy

                                'COMMITTED'  last commit at or before BASE

                                'PREV'       revision just before COMMITTED

  -v [--verbose]           : print extra information

  -R [--recursive]         : descend recursively, same as --depth=infinity

  --depth ARG              : limit operation by depth ARG ('empty', 'files',

                             'immediates', or 'infinity')

  --incremental            : give output suitable for concatenation

  --xml                    : output in XML

  --include-externals      : include externals definitions

Global options:

  --username ARG           : specify a username ARG

  --password ARG           : specify a password ARG

  --no-auth-cache          : do not cache authentication tokens

  --non-interactive        : do no interactive prompting (default is to prompt

                             only if standard input is a terminal device)

  --force-interactive      : do interactive prompting even if standard input

                             is not a terminal device

  --trust-server-cert      : accept SSL server certificates from unknown

                             certificate authorities without prompting (but only

                             with '--non-interactive')

  --config-dir ARG         : read user configuration files from directory ARG

  --config-option ARG      : set user configuration option in the format:

                                 FILE:SECTION:OPTION=[VALUE]

                             For example:

                                 servers:global:http-library=serf 

export LC_ALL=en_US.utf8

export LANG=en_US.utf8

$ cat mailer.py

#!/usr/bin/python

# -*- coding:utf-8 -*-

import smtplib

import sys

import os

from email.mime.multipart import MIMEMultipart

from email.MIMEText import MIMEText

from subprocess import Popen, PIPE

smtp_hostname="smtp.mailserver.com:port"

smtp_username="mailer@mailserver.com"

smtp_password="password"

toaddrs  = ['user1@mailserver.com','user2@mailserver.com','user2@mailserver.com']

project_name = os.path.basename(sys.argv[1])

subject = "["+project_name+"]"+" svn repository update required"

content = project_name + "\n" + "rev : " + sys.argv[2]+ "\n"

cmd_1 = ['svnlook','changed','-r',sys.argv[2],sys.argv[1]]

proc = Popen(cmd_1, stdout=PIPE)

difflist = proc.stdout.read()

cmd_2 = ['svnlook','info','-r',sys.argv[2],sys.argv[1]]

proc = Popen(cmd_2, stdout=PIPE)

svninfo = proc.stdout.read()

content = "[" + project_name + "]\n" + "rev : " + sys.argv[2]+ "\n" + difflist +"\n" + svninfo

msg = MIMEMultipart()

msg['From'] = smtp_username

msg['To'] = ", ".join(toaddrs)

msg['Subject'] = subject

msg.attach(MIMEText(content,_charset='utf-8'))

print msg.as_string()

server = smtplib.SMTP_SSL(smtp_hostname)

server.login(smtp_username,smtp_password)

server.sendmail(smtp_username, toaddrs, msg.as_string())

server.quit()

$ sudo apt-get install colordiff

$ vi ~/.subversion/config

[helpers]

diff-cmd = colordiff